archive/php-src
1
0
Fork 0
mirror of https://github.com/php/php-src.git synced 2025-08-20 17:34:35 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions 2

Never trust snprintf return value

Browse source
This commit is contained in:
Stanislav Malyshev 2000-09-08 12:52:05 +00:00
parent 6426d1c9ce
commit 522aec4443
2 changed files with 6 additions and 0 deletions
Download patch file Download diff file Expand all files Collapse all files

3
main/fopen_wrappers.c
View file

@ -568,6 +568,9 @@ static FILE *php_fopen_url_wrap_http(const char *path, char *mode, int options,
len = snprintf(hdr_line, sizeof(hdr_line), len = snprintf(hdr_line, sizeof(hdr_line),
"Host: %s\r\n", resource->host); "Host: %s\r\n", resource->host);
} }
if(len > sizeof(hdr_line) - 1) {
len = sizeof(hdr_line) - 1;
}
if (len > 0) { if (len > 0) {
SOCK_WRITE(hdr_line, *socketd); SOCK_WRITE(hdr_line, *socketd);
} }

3
main/main.c
View file

@ -317,6 +317,9 @@ PHPAPI int php_printf(const char *format, ...)
va_start(args, format); va_start(args, format);
size = vsnprintf(buffer, sizeof(buffer), format, args); size = vsnprintf(buffer, sizeof(buffer), format, args);
if(size > sizeof(buffer) - 1) {
size = sizeof(buffer) - 1;
}
ret = PHPWRITE(buffer, size); ret = PHPWRITE(buffer, size);
va_end(args); va_end(args);