generic-library/curl
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

curl tool: OOM handling fixes

Browse Source
This commit is contained in:
Yang Tse 2011-10-05 16:41:04 +02:00
parent 5bf0d74120
commit ec73fd89ed
2 changed files with 15 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

18
src/tool_getparam.c
View File

@ -936,7 +936,8 @@ ParameterError getparameter(char *flag, /* f or -long-flag */
}
else {
GetStr(&postdata, p);
size = strlen(postdata);
if(postdata)
size = strlen(postdata);
}
if(!postdata) {
@ -1019,8 +1020,12 @@ ParameterError getparameter(char *flag, /* f or -long-flag */
}
#ifdef CURL_DOES_CONVERSIONS
if(subletter != 'b') { /* NOT forced binary, convert to ASCII */
convert_to_network(postdata, strlen(postdata));
if(subletter != 'b') {
/* NOT forced binary, convert to ASCII */
if(convert_to_network(postdata, strlen(postdata))) {
Curl_safefree(postdata);
return PARAM_NO_MEM;
}
}
#endif
@ -1032,6 +1037,7 @@ ParameterError getparameter(char *flag, /* f or -long-flag */
curl_off_t newlen = oldlen + size + 2;
config->postfields = malloc((size_t)newlen);
if(!config->postfields) {
Curl_safefree(oldpost);
Curl_safefree(postdata);
return PARAM_NO_MEM;
}
@ -1053,8 +1059,10 @@ ParameterError getparameter(char *flag, /* f or -long-flag */
We can't set the request type here, as this data might be used in
a simple GET if -G is used. Already or soon.
if(SetHTTPrequest(HTTPREQ_SIMPLEPOST, &config->httpreq))
return PARAM_BAD_USE;
if(SetHTTPrequest(HTTPREQ_SIMPLEPOST, &config->httpreq)) {
Curl_safefree(postdata);
return PARAM_BAD_USE;
}
*/
break;
case 'D':

3
src/tool_operhlp.c
View File

@ -132,6 +132,7 @@ char *add_file_name_to_url(CURL *curl, char *url, const char *filename)
if(encfile) {
char *urlbuffer = malloc(strlen(url) + strlen(encfile) + 3);
if(!urlbuffer) {
curl_free(encfile);
Curl_safefree(url);
return NULL;
}
@ -143,8 +144,8 @@ char *add_file_name_to_url(CURL *curl, char *url, const char *filename)
sprintf(urlbuffer, "%s/%s", url, encfile);
curl_free(encfile);
Curl_safefree(url);
url = urlbuffer; /* use our new URL instead! */
}
}