moparisthebest/curl
1
0
Fork 0
mirror of https://github.com/moparisthebest/curl synced 2024-11-11 12:05:06 -05:00
Code Issues Releases Wiki Activity

formdata: Check if length is too large for memory

Browse Source 
- If the size of the length type (curl_off_t) is greater than the size
of the size_t type then check before allocating memory to make sure the
value of length will fit in a size_t without overflow. If it doesn't
then return CURLE_BAD_FUNCTION_ARGUMENT.

Bug: https://github.com/bagder/curl/issues/425#issuecomment-154518679
Reported-by: Steve Holme
This commit is contained in:
Jay Satiro 2015-12-07 02:43:24 -05:00
parent a62000ecc9
commit 738b0ba09e
1 changed files with 11 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

15
lib/formdata.c
View File

@ -830,19 +830,26 @@ static CURLcode AddFormData(struct FormData **formp,
return CURLE_OUT_OF_MEMORY; return CURLE_OUT_OF_MEMORY;
newform->next = NULL; newform->next = NULL;
if(length < 0 || (size && *size < 0))
return CURLE_BAD_FUNCTION_ARGUMENT;
if(type <= FORM_CONTENT) { if(type <= FORM_CONTENT) {
/* we make it easier for plain strings: */ /* we make it easier for plain strings: */
if(!length) if(!length)
length = strlen((char *)line); length = strlen((char *)line);
#if (SIZEOF_SIZE_T < CURL_SIZEOF_CURL_OFF_T)
else if(length >= (curl_off_t)(size_t)-1)
return CURLE_BAD_FUNCTION_ARGUMENT;
#endif
newform->line = malloc(length+1); newform->line = malloc((size_t)length+1);
if(!newform->line) { if(!newform->line) {
free(newform); free(newform);
return CURLE_OUT_OF_MEMORY; return CURLE_OUT_OF_MEMORY;
} }
memcpy(newform->line, line, length); memcpy(newform->line, line, (size_t)length);
newform->length = length; newform->length = (size_t)length;
newform->line[length]=0; /* zero terminate for easier debugging */ newform->line[(size_t)length]=0; /* zero terminate for easier debugging */
} }
else else
/* For callbacks and files we don't have any actual data so we just keep a /* For callbacks and files we don't have any actual data so we just keep a