diff options
Diffstat (limited to 'lib/multi.c')
| -rw-r--r-- | lib/multi.c | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/lib/multi.c b/lib/multi.c index b0104310b..f4e15c413 100644 --- a/lib/multi.c +++ b/lib/multi.c @@ -5,7 +5,7 @@ * | (__| |_| | _ <| |___ * \___|\___/|_| \_\_____| * - * Copyright (C) 1998 - 2011, Daniel Stenberg, <daniel@haxx.se>, et al. + * Copyright (C) 1998 - 2012, Daniel Stenberg, <daniel@haxx.se>, et al. * * This software is licensed as described in the file COPYING, which * you should have received as part of this distribution. The terms @@ -2018,12 +2018,13 @@ static void singlesocket(struct Curl_multi *multi, remove_sock_from_hash = FALSE; if(remove_sock_from_hash) { + /* in this case 'entry' is always non-NULL */ if(multi->socket_cb) multi->socket_cb(easy->easy_handle, s, CURL_POLL_REMOVE, multi->socket_userp, - entry ? entry->socketp : NULL); + entry->socketp); sh_delentry(multi->sockhash, s); } |