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

Fixes some more out of memory handling bugs.

Browse Source
This commit is contained in:
Dan Fandrich 2007-04-04 23:41:35 +00:00
parent 7e74349b86
commit c321b9f704
4 changed files with 9 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
lib/base64.c
View File

@ -173,11 +173,13 @@ size_t Curl_base64_encode(struct SessionHandle *data,
if(data) { if(data) {
convbuf = (char*)malloc(insize); convbuf = (char*)malloc(insize);
if(!convbuf) { if(!convbuf) {
free(output);
return 0; return 0;
} }
memcpy(convbuf, indata, insize); memcpy(convbuf, indata, insize);
if(CURLE_OK != Curl_convert_to_network(data, convbuf, insize)) { if(CURLE_OK != Curl_convert_to_network(data, convbuf, insize)) {
free(convbuf); free(convbuf);
free(output);
return 0; return 0;
} }
indata = convbuf; /* switch to the converted buffer */ indata = convbuf; /* switch to the converted buffer */

2
lib/http_negotiate.c
View File

@ -295,7 +295,7 @@ CURLcode Curl_output_negotiate(struct connectdata *conn)
neg_ctx->output_token.length, neg_ctx->output_token.length,
&encoded); &encoded);
if (len < 0) if (len == 0)
return CURLE_OUT_OF_MEMORY; return CURLE_OUT_OF_MEMORY;
conn->allocptr.userpwd = conn->allocptr.userpwd =

4
lib/http_ntlm.c
View File

@ -421,6 +421,10 @@ static void mk_nt_hash(struct SessionHandle *data,
{ {
size_t len = strlen(password); size_t len = strlen(password);
unsigned char *pw = malloc(len*2); unsigned char *pw = malloc(len*2);
if (!pw)
/* No way to report this error; just rely on future malloc failures
to be caught */
return;
utf8_to_unicode_le(pw, password, len); utf8_to_unicode_le(pw, password, len);

2
lib/url.c
View File

@ -2856,6 +2856,8 @@ static CURLcode CreateConnection(struct SessionHandle *data,
/* Initialize the pipeline lists */ /* Initialize the pipeline lists */
conn->send_pipe = Curl_llist_alloc((curl_llist_dtor) llist_dtor); conn->send_pipe = Curl_llist_alloc((curl_llist_dtor) llist_dtor);
conn->recv_pipe = Curl_llist_alloc((curl_llist_dtor) llist_dtor); conn->recv_pipe = Curl_llist_alloc((curl_llist_dtor) llist_dtor);
if (!conn->send_pipe || !conn->recv_pipe)
return CURLE_OUT_OF_MEMORY;
/* Store creation time to help future close decision making */ /* Store creation time to help future close decision making */
conn->created = Curl_tvnow(); conn->created = Curl_tvnow();