multi.c: fix possible dereference of null pointer

2014-01-05 20:01:33 +01:00
parent 149e0c8d10
commit 61312fe66f
1 changed files with 6 additions and 4 deletions
--- a/lib/multi.c
+++ b/lib/multi.c
@@ -2162,10 +2162,12 @@ static CURLMcode multi_socket(struct Curl_multi *multi,

    /* walk through each easy handle and do the socket state change magic
       and callbacks */
-    data=multi->easyp;
-    while(data) {
-      singlesocket(multi, data);
-      data = data->next;
+    if(result != CURLM_BAD_HANDLE) {
+      data=multi->easyp;
+      while(data) {
+        singlesocket(multi, data);
+        data = data->next;
+      }
    }

    /* or should we fall-through and do the timer-based stuff? */