diff options
| -rw-r--r-- | lib/mprintf.c | 6 | ||||
| -rw-r--r-- | tests/libtest/lib557.c | 11 |
2 files changed, 16 insertions, 1 deletions
diff --git a/lib/mprintf.c b/lib/mprintf.c index 7af2f4a83..80735be51 100644 --- a/lib/mprintf.c +++ b/lib/mprintf.c @@ -764,7 +764,7 @@ static int dprintf_formatf( if(prec > 0) { width -= prec; - while(prec-- > 0) + while(prec-- > 0 && w >= work) *w-- = '0'; } @@ -928,6 +928,8 @@ static int dprintf_formatf( precision */ size_t maxprec = sizeof(work) - 2; double val = p->data.dnum; + if(width > 0 && prec <= width) + maxprec -= width; while(val >= 10.0) { val /= 10; maxprec--; @@ -935,6 +937,8 @@ static int dprintf_formatf( if(prec > (long)maxprec) prec = (long)maxprec-1; + if(prec < 0) + prec = 0; /* RECURSIVE USAGE */ len = curl_msnprintf(fptr, left, ".%ld", prec); fptr += len; diff --git a/tests/libtest/lib557.c b/tests/libtest/lib557.c index 2e51b99c1..a1be9b7df 100644 --- a/tests/libtest/lib557.c +++ b/tests/libtest/lib557.c @@ -1537,6 +1537,17 @@ static int test_weird_arguments(void) errors += string_check(buf, ""); + /* Do not skip sanity checks with parameters! */ + buf[0] = 0; + rc = curl_msnprintf(buf, sizeof(buf), "%d, %.*1$d", 500, 1); + + if(rc != 256) { + printf("curl_mprintf() returned %d and not 256!\n", rc); + errors++; + } + + errors += strlen_check(buf, 255); + if(errors) printf("Some curl_mprintf() weird arguments tests failed!\n"); |