romenskiy2012/curl
1
0
Fork 0
mirror of https://github.com/curl/curl.git synced 2026-08-24 21:53:37 +03:00
Code Issues Projects Releases Packages Wiki Activity

snprintf: renamed and we now only use msnprintf()

Browse source 
The function does not return the same value as snprintf() normally does,
so readers may be mislead into thinking the code works differently than
it actually does. A different function name makes this easier to detect.

Reported-by: Tomas Hoger
Assisted-by: Daniel Gustafsson
Fixes #3296
Closes #3297
This commit is contained in:
Daniel Stenberg 2018-11-22 09:01:24 +01:00
parent 9944d6ba33
commit dcd6f81025
No known key found for this signature in database
GPG key ID: 5CC908FDB71E12C2
92 changed files with 632 additions and 631 deletions
Download patch file Download diff file Expand all files Collapse all files

8
lib/sendf.c
View file

@ -237,7 +237,7 @@ void Curl_infof(struct Curl_easy *data, const char *fmt, ...)
size_t len;
char print_buffer[2048 + 1];
va_start(ap, fmt);
len = vsnprintf(print_buffer, sizeof(print_buffer), fmt, ap);
len = mvsnprintf(print_buffer, sizeof(print_buffer), fmt, ap);
/*
* Indicate truncation of the input by replacing the last 3 characters
* with "...", and transfer the newline over in case the format had one.
@ -245,9 +245,9 @@ void Curl_infof(struct Curl_easy *data, const char *fmt, ...)
if(len >= sizeof(print_buffer)) {
len = strlen(fmt);
if(fmt[--len] == '\n')
snprintf(print_buffer + (sizeof(print_buffer) - 5), 5, "...\n");
msnprintf(print_buffer + (sizeof(print_buffer) - 5), 5, "...\n");
else
snprintf(print_buffer + (sizeof(print_buffer) - 4), 4, "...");
msnprintf(print_buffer + (sizeof(print_buffer) - 4), 4, "...");
}
va_end(ap);
len = strlen(print_buffer);
@ -266,7 +266,7 @@ void Curl_failf(struct Curl_easy *data, const char *fmt, ...)
size_t len;
char error[CURL_ERROR_SIZE + 2];
va_start(ap, fmt);
vsnprintf(error, CURL_ERROR_SIZE, fmt, ap);
mvsnprintf(error, CURL_ERROR_SIZE, fmt, ap);
len = strlen(error);
if(data->set.errorbuffer && !data->state.errorbuf) {