Commit d81f5ea3 authored by Daniel Stenberg's avatar Daniel Stenberg
Browse files

multi interface: only use non-NULL function pointer! 

If the socket callback function pointer hasn't been set, we must not
attempt to use it. Commit adc88ca2 made it more likely to occur.
parent adc88ca2

lib/multi.c

+12 −10
Original line number Diff line number Diff line
@@ -1940,6 +1940,7 @@ static void singlesocket(struct Curl_multi *multi, 
    }



    /* we know (entry != NULL) at this point, see the logic above */

    if(multi->socket_cb)

      multi->socket_cb(easy->easy_handle,

                       s,

                       action,
@@ -2019,6 +2020,7 @@ static void singlesocket(struct Curl_multi *multi, 
        remove_sock_from_hash = FALSE;



      if(remove_sock_from_hash) {

        if(multi->socket_cb)

          multi->socket_cb(easy->easy_handle,

                           s,

                           CURL_POLL_REMOVE,