diff options
Diffstat (limited to 'pppd/utils.c')
| -rw-r--r-- | pppd/utils.c | 19 |
1 files changed, 11 insertions, 8 deletions
diff --git a/pppd/utils.c b/pppd/utils.c index 2cc0e91..3602aa6 100644 --- a/pppd/utils.c +++ b/pppd/utils.c @@ -166,6 +166,7 @@ vslprintf(buf, buflen, fmt, args) u_int32_t ip; static char hexchars[] = "0123456789abcdef"; struct buffer_info bufinfo; + int termch; buf0 = buf; --buflen; @@ -299,14 +300,17 @@ vslprintf(buf, buflen, fmt, args) p = (unsigned char *)"<NULL>"; if (fillch == '0' && prec >= 0) { n = prec; + termch = -1; /* matches no unsigned char value */ } else { - if (prec == -1) - n = strlen((char *)p); - else - n = strnlen((char *)p, prec); + n = buflen; + if (prec != -1 && n > prec) + n = prec; + termch = 0; /* stop on null byte */ } while (n > 0 && buflen > 0) { c = *p++; + if (c == termch) + break; --n; if (!quoted && c >= 0x80) { OUTCHAR('M'); @@ -386,10 +390,9 @@ vslprintf(buf, buflen, fmt, args) } len = num + sizeof(num) - 1 - str; } else { - if (prec == -1) - len = strlen(str); - else - len = strnlen(str, prec); + for (len = 0; len < buflen && (prec == -1 || len < prec); ++len) + if (str[len] == 0) + break; } if (width > 0) { if (width > buflen) |