diff options
| author | Chalard Jean <jchalard@google.com> | 2021-07-16 09:00:36 +0000 |
|---|---|---|
| committer | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | 2021-07-16 09:00:36 +0000 |
| commit | 650e816f7e186ecaee899fa14fb34e10f9644fa1 (patch) | |
| tree | a3820e13080c7a8ec8151ef04919fb86fddd74c8 | |
| parent | 0b316872d55f2676c221cf54d2a2a87d2f9457f2 (diff) | |
| parent | e2e9de9526c0327a1774d3ba3e45bbf010430e76 (diff) | |
| download | ppp-650e816f7e186ecaee899fa14fb34e10f9644fa1.tar.gz | |
Merge "vslprintf should never read more than the precision" am: e2e9de9526
Original change: https://android-review.googlesource.com/c/platform/external/ppp/+/1765873
Change-Id: I74d81d013aeee8fe7445e6c037949ef33fc9289c
| -rw-r--r-- | pppd/utils.c | 8 |
1 files changed, 5 insertions, 3 deletions
diff --git a/pppd/utils.c b/pppd/utils.c index 87a118d..80cc292 100644 --- a/pppd/utils.c +++ b/pppd/utils.c @@ -311,9 +311,11 @@ vslprintf(buf, buflen, fmt, args) if (fillch == '0' && prec >= 0) { n = prec; } else { - n = strlen((char *)p); - if (prec >= 0 && n > prec) - n = prec; + if (prec >= 0) { + n = strnlen((char *)p, prec); + } else { + n = strlen((char *)p); + } } while (n > 0 && buflen > 0) { c = *p++; |