mirror/curl
2
0
Fork 0
mirror of https://github.com/curl/curl.git synced 2025-01-12 13:55:11 +08:00
Code Issues Packages Projects Releases Wiki Activity

mprintf: overhaul and bugfixes

Browse Source 
In a test case using lots of snprintf() calls using many commonly used
%-codes per call, this version is around 30% faster than previous
version.

It also fixes the #12561 bug which made it not behave correctly when
given unknown %-sequences. Fixing that flaw required a different take on
the problem, which resulted in the new two-arrays model.

lib557: extended - Verify the #12561 fix and test more printf features

unit1398: fix test: It used a <num>$ only for one argument, which is not
supported.

Fixes #12561
Closes #12563
This commit is contained in:
Daniel Stenberg 2023-12-22 09:51:20 +01:00
parent 2d4d0c1fd3
commit ef2cf58c77
No known key found for this signature in database
GPG Key ID: 5CC908FDB71E12C2
3 changed files with 653 additions and 587 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1182
lib/mprintf.c
View File

File diff suppressed because it is too large Load Diff

56
tests/libtest/lib557.c
View File

@ -1181,12 +1181,49 @@ static int test_string_formatting(void)
return errors;
}
static int test_pos_arguments(void)
{
int errors = 0;
char buf[256];
curl_msnprintf(buf, sizeof(buf), "%3$d %2$d %1$d", 500, 501, 502);
errors += string_check(buf, "502 501 500");
curl_msnprintf(buf, sizeof(buf), "%3$d %1$d %2$d", 500, 501, 502);
errors += string_check(buf, "502 500 501");
/* this is in invalid sequence but the output does not match
what glibc does */
curl_msnprintf(buf, sizeof(buf), "%3$d %d %2$d", 500, 501, 502);
errors += string_check(buf, "");
return errors;
}
static int test_weird_arguments(void)
{
int errors = 0;
char buf[256];
int rc;
/* verify %% */
rc = curl_msnprintf(buf, sizeof(buf), "%-20d%% right? %%", 500);
errors += string_check(buf, "500 % right? %");
/* 100 x % */
rc = curl_msnprintf(buf, sizeof(buf), "%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%"
"%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%"
"%%%%%%%%%%%%%%%%%%%%%%");
/* 50 x % */
errors += string_check(buf, "%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%"
"%%%%%%%%%%%%%%%");
rc = curl_msnprintf(buf, sizeof(buf), "%2 AA %d %K", 500, 501, 502);
errors += string_check(buf, "%2 AA 500 %K");
rc = curl_msnprintf(buf, sizeof(buf), "%2 %d %K", 500, 501, 502);
errors += string_check(buf, "%2 500 %K");
/* MAX_PARAMETERS is 128, try exact 128! */
rc = curl_msnprintf(buf, sizeof(buf),
"%d%d%d%d%d%d%d%d%d%d" /* 10 */
@ -1276,18 +1313,6 @@ 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 != sizeof(buf) - 1) {
printf("curl_mprintf() returned %d and not %zu!\n", rc,
sizeof(buf) - 1);
errors++;
}
errors += strlen_check(buf, 255);
if(errors)
printf("Some curl_mprintf() weird arguments tests failed!\n");
@ -1374,9 +1399,10 @@ static int test_float_formatting(void)
123456789123456789123456789.2987654);
errors += strlen_check(buf, 325);
/* check negative when used signed */
/* check negative width argument when used signed, is treated as positive
and maxes out the internal float width == 325 */
curl_msnprintf(buf, sizeof(buf), "%*f", INT_MIN, 9.1);
errors += string_check(buf, "9.100000");
errors += string_check(buf, "9.100000 ");
/* curl_msnprintf() limits a single float output to 325 bytes maximum
width */
@ -1451,6 +1477,8 @@ int test(char *URL)
setlocale(LC_NUMERIC, "C");
#endif
errors += test_pos_arguments();
errors += test_weird_arguments();
errors += test_unsigned_short_formatting();

2
tests/unit/unit1398.c
View File

@ -92,7 +92,7 @@ fail_unless(rc == 15, "return code should be 15");
fail_unless(!strcmp(output, " 1234 567"), "wrong output");
/* double precision */
rc = curl_msnprintf(output, 24, "%.*1$.99d", 3, 5678);
rc = curl_msnprintf(output, 24, "%2$.*1$.99d", 3, 5678);
fail_unless(rc == 0, "return code should be 0");
UNITTEST_STOP