diff options
| author | Daniel Stenberg <daniel@haxx.se> | 2006-02-23 12:20:48 +0000 |
|---|---|---|
| committer | Daniel Stenberg <daniel@haxx.se> | 2006-02-23 12:20:48 +0000 |
| commit | 6fdbb011948cc9fd2cadff04b230427cf02dbd7d (patch) | |
| tree | 2aa747888250eab64d0bc6f0262790f8bfe77c26 /lib/hostip.h | |
| parent | d29147565c000c01a5ac20b12993c8fd726b1fa2 (diff) | |
| download | curl-6fdbb011948cc9fd2cadff04b230427cf02dbd7d.tar.gz | |
Lots of work and analysis by "xbx___" in bug #1431750
(http://curl.haxx.se/bug/view.cgi?id=1431750) helped me identify and fix two
different but related bugs:
1) Removing an easy handle from a multi handle before the transfer is done
could leave a connection in the connection cache for that handle that is
in a state that isn't suitable for re-use. A subsequent re-use could then
read from a NULL pointer and segfault.
2) When an easy handle was removed from the multi handle, there could be an
outstanding c-ares DNS name resolve request. When the response arrived,
it caused havoc since the connection struct it "belonged" to could've
been freed already.
Now Curl_done() is called when an easy handle is removed from a multi handle
pre-maturely (that is, before the transfer was complteted). Curl_done() also
makes sure to cancel all (if any) outstanding c-ares requests.
Diffstat (limited to 'lib/hostip.h')
| -rw-r--r-- | lib/hostip.h | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/lib/hostip.h b/lib/hostip.h index 3baf8284b..62c6721e1 100644 --- a/lib/hostip.h +++ b/lib/hostip.h @@ -7,7 +7,7 @@ * | (__| |_| | _ <| |___ * \___|\___/|_| \_\_____| * - * Copyright (C) 1998 - 2005, Daniel Stenberg, <daniel@haxx.se>, et al. + * Copyright (C) 1998 - 2006, 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 @@ -82,6 +82,7 @@ #define CURL_ASYNC_SUCCESS ARES_SUCCESS #else #define CURL_ASYNC_SUCCESS CURLE_OK +#define ares_cancel(x) #endif /* |