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

Improved behaviour in out of memory conditions.

Browse Source
This commit is contained in:
Dan Fandrich 2007-05-01 20:52:05 +00:00
parent 93844f64ef
commit 19a80add95
1 changed files with 11 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

15
src/main.c
View File

@ -3409,7 +3409,7 @@ CURLcode _my_setopt(CURL *curl, const char *name, CURLoption tag, ...)
remark?"/* ":"", name, value, remark?"/* ":"", name, value,
remark?" [REMARK] */":""); remark?" [REMARK] */":"");
if (!curl_slist_append(easycode, bufp)) if (!bufp || !curl_slist_append(easycode, bufp))
ret = CURLE_OUT_OF_MEMORY; ret = CURLE_OUT_OF_MEMORY;
curl_free(bufp); curl_free(bufp);
va_end(arg); va_end(arg);
@ -3500,7 +3500,7 @@ operate(struct Configurable *config, int argc, argv_item_t argv[])
URLGlob *inglob=NULL; URLGlob *inglob=NULL;
int urlnum; int urlnum;
int infilenum; int infilenum;
char *outfiles; char *outfiles=NULL;
char *infiles; /* might a glob pattern */ char *infiles; /* might a glob pattern */
char *uploadfile=NULL; /* a single file, never a glob */ char *uploadfile=NULL; /* a single file, never a glob */
@ -3776,7 +3776,13 @@ operate(struct Configurable *config, int argc, argv_item_t argv[])
outs.bytes = 0; /* nothing written yet */ outs.bytes = 0; /* nothing written yet */
/* save outfile pattern before expansion */ /* save outfile pattern before expansion */
outfiles = urlnode->outfile?strdup(urlnode->outfile):NULL; if (urlnode->outfile) {
outfiles = strdup(urlnode->outfile);
if (!outfiles) {
clean_getout(config);
break;
}
}
infiles = urlnode->infile; infiles = urlnode->infile;
@ -4592,7 +4598,8 @@ quit_curl:
/* cleanup the curl handle! */ /* cleanup the curl handle! */
curl_easy_cleanup(curl); curl_easy_cleanup(curl);
curl_slist_append(easycode, "curl_easy_cleanup(hnd);"); if (easycode)
curl_slist_append(easycode, "curl_easy_cleanup(hnd);");
if(config->headerfile && !headerfilep && heads.stream) if(config->headerfile && !headerfilep && heads.stream)
fclose(heads.stream); fclose(heads.stream);