Commit 64b2d2d7 authored by Daniel Stenberg's avatar Daniel Stenberg
Browse files

multi_runsingle: avoid NULL dereference 

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
parent 88264355

lib/multi.c

+5 −3
Original line number Diff line number Diff line
@@ -1202,8 +1202,9 @@ static CURLMcode multi_runsingle(struct Curl_multi *multi, 
      }

      else {

        /* Perform the protocol's DO action */

        easy->result = Curl_do(&easy->easy_conn,

                               &dophase_done);

        easy->result = Curl_do(&easy->easy_conn, &dophase_done);



        /* When Curl_do() returns failure, easy->easy_conn might be NULL! */



        if(CURLE_OK == easy->result) {

          if(!dophase_done) {
@@ -1292,6 +1293,7 @@ static CURLMcode multi_runsingle(struct Curl_multi *multi, 
        else {

          /* failure detected */

          Curl_posttransfer(data);

          if(easy->easy_conn)

            Curl_done(&easy->easy_conn, easy->result, FALSE);

          disconnect_conn = TRUE;

        }