curl/curl
1
1
Fork 0
mirror of https://github.com/curl/curl.git synced 2025-09-17 17:42:49 +03:00
Code Issues Packages Projects Releases Wiki Activity

mprintf: make dprintf_formatf never return negative

Browse Source 
This function no longer returns a negative value if the formatting
string is bad since the return value would sometimes be propagated as a
return code from the mprintf* functions and they are documented to
return the length of the output. Which cannot be negative.

Fixes #9149
Closes #9151
Reported-by: yiyuaner on github
This commit is contained in:
Daniel Stenberg 2022-07-13 23:46:16 +02:00
parent 8d06af10fb
commit 0e48ac1f99
No known key found for this signature in database
GPG Key ID: 5CC908FDB71E12C2
3 changed files with 10 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
lib/mprintf.c
View File

@ -594,7 +594,7 @@ static int dprintf_formatf(
/* Do the actual %-code parsing */ /* Do the actual %-code parsing */
if(dprintf_Pass1(format, vto, endpos, ap_save)) if(dprintf_Pass1(format, vto, endpos, ap_save))
return -1; return 0;
end = &endpos[0]; /* the initial end-position from the list dprintf_Pass1() end = &endpos[0]; /* the initial end-position from the list dprintf_Pass1()
created for us */ created for us */
@ -1025,11 +1025,12 @@ int curl_mvsnprintf(char *buffer, size_t maxlength, const char *format,
info.max = maxlength; info.max = maxlength;
retcode = dprintf_formatf(&info, addbyter, format, ap_save); retcode = dprintf_formatf(&info, addbyter, format, ap_save);
if((retcode != -1) && info.max) { if(info.max) {
/* we terminate this with a zero byte */ /* we terminate this with a zero byte */
if(info.max == info.length) { if(info.max == info.length) {
/* we're at maximum, scrap the last letter */ /* we're at maximum, scrap the last letter */
info.buffer[-1] = 0; info.buffer[-1] = 0;
DEBUGASSERT(retcode);
retcode--; /* don't count the nul byte */ retcode--; /* don't count the nul byte */
} }
else else
@ -1073,7 +1074,7 @@ int Curl_dyn_vprintf(struct dynbuf *dyn, const char *format, va_list ap_save)
info.fail = 0; info.fail = 0;
retcode = dprintf_formatf(&info, alloc_addbyter, format, ap_save); retcode = dprintf_formatf(&info, alloc_addbyter, format, ap_save);
if((-1 == retcode) || info.fail) { if(!retcode && info.fail) {
Curl_dyn_free(info.b); Curl_dyn_free(info.b);
return 1; return 1;
} }
@ -1082,15 +1083,14 @@ int Curl_dyn_vprintf(struct dynbuf *dyn, const char *format, va_list ap_save)
char *curl_mvaprintf(const char *format, va_list ap_save) char *curl_mvaprintf(const char *format, va_list ap_save)
{ {
int retcode;
struct asprintf info; struct asprintf info;
struct dynbuf dyn; struct dynbuf dyn;
info.b = &dyn; info.b = &dyn;
Curl_dyn_init(info.b, DYN_APRINTF); Curl_dyn_init(info.b, DYN_APRINTF);
info.fail = 0; info.fail = 0;
retcode = dprintf_formatf(&info, alloc_addbyter, format, ap_save); (void)dprintf_formatf(&info, alloc_addbyter, format, ap_save);
if((-1 == retcode) || info.fail) { if(info.fail) {
Curl_dyn_free(info.b); Curl_dyn_free(info.b);
return NULL; return NULL;
} }

4
lib/sendf.c
View File

@ -245,7 +245,7 @@ void Curl_infof(struct Curl_easy *data, const char *fmt, ...)
DEBUGASSERT(!strchr(fmt, '\n')); DEBUGASSERT(!strchr(fmt, '\n'));
if(data && data->set.verbose) { if(data && data->set.verbose) {
va_list ap; va_list ap;
size_t len; int len;
char buffer[MAXINFO + 2]; char buffer[MAXINFO + 2];
va_start(ap, fmt); va_start(ap, fmt);
len = mvsnprintf(buffer, MAXINFO, fmt, ap); len = mvsnprintf(buffer, MAXINFO, fmt, ap);
@ -265,7 +265,7 @@ void Curl_failf(struct Curl_easy *data, const char *fmt, ...)
DEBUGASSERT(!strchr(fmt, '\n')); DEBUGASSERT(!strchr(fmt, '\n'));
if(data->set.verbose || data->set.errorbuffer) { if(data->set.verbose || data->set.errorbuffer) {
va_list ap; va_list ap;
size_t len; int len;
char error[CURL_ERROR_SIZE + 2]; char error[CURL_ERROR_SIZE + 2];
va_start(ap, fmt); va_start(ap, fmt);
len = mvsnprintf(error, CURL_ERROR_SIZE, fmt, ap); len = mvsnprintf(error, CURL_ERROR_SIZE, fmt, ap);

4
tests/libtest/lib557.c
View File

@ -1532,8 +1532,8 @@ static int test_weird_arguments(void)
0, 1, 2, 3, 4, 5, 6, 7, 8, 9, /* 10 11 */ 0, 1, 2, 3, 4, 5, 6, 7, 8, 9, /* 10 11 */
0, 1, 2, 3, 4, 5, 6, 7, 8); /* 9 */ 0, 1, 2, 3, 4, 5, 6, 7, 8); /* 9 */
if(rc != -1) { if(rc) {
printf("curl_mprintf() returned %d and not -1!\n", rc); printf("curl_mprintf() returned %d and not 0\n", rc);
errors++; errors++;
} }