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

multi_runsingle: avoid NULL dereference

Browse Source 
When Curl_do() returns failure, the connection pointer could be NULL so
the code path following needs to that that into account.

Bug: http://curl.haxx.se/mail/lib-2013-03/0062.html
Reported by: Eric Hu
This commit is contained in:
Daniel Stenberg 2013-03-09 18:05:28 +01:00
parent 8826435571
commit 64b2d2d77e
1 changed files with 5 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
lib/multi.c
View File

@ -1202,8 +1202,9 @@ static CURLMcode multi_runsingle(struct Curl_multi *multi,
} }
else { else {
/* Perform the protocol's DO action */ /* Perform the protocol's DO action */
easy->result = Curl_do(&easy->easy_conn, easy->result = Curl_do(&easy->easy_conn, &dophase_done);
&dophase_done);
/* When Curl_do() returns failure, easy->easy_conn might be NULL! */
if(CURLE_OK == easy->result) { if(CURLE_OK == easy->result) {
if(!dophase_done) { if(!dophase_done) {
@ -1292,7 +1293,8 @@ static CURLMcode multi_runsingle(struct Curl_multi *multi,
else { else {
/* failure detected */ /* failure detected */
Curl_posttransfer(data); Curl_posttransfer(data);
Curl_done(&easy->easy_conn, easy->result, FALSE); if(easy->easy_conn)
Curl_done(&easy->easy_conn, easy->result, FALSE);
disconnect_conn = TRUE; disconnect_conn = TRUE;
} }
} }