diff options
| author | Daniel Stenberg <daniel@haxx.se> | 2018-12-20 16:39:02 +0100 |
|---|---|---|
| committer | Daniel Stenberg <daniel@haxx.se> | 2018-12-22 18:14:50 +0100 |
| commit | fb445a1e18d12f577964c9347bc5bca74b37cd08 (patch) | |
| tree | f4f9b2971a2c4b2d41f05bbf58508f8ae22100f7 /lib/multi.c | |
| parent | d18a5afaf07fdc093c6a6131cc7926a3d5a55407 (diff) | |
| download | gnurl-fb445a1e18d12f577964c9347bc5bca74b37cd08.tar.gz gnurl-fb445a1e18d12f577964c9347bc5bca74b37cd08.tar.bz2 gnurl-fb445a1e18d12f577964c9347bc5bca74b37cd08.zip | |
disconnect: separate connections and easy handles better
Do not assume/store assocation between a given easy handle and the
connection if it can be avoided.
Long-term, the 'conn->data' pointer should probably be removed as it is a
little too error-prone. Still used very widely though.
Reported-by: masbug on github
Fixes #3391
Closes #3400
Diffstat (limited to 'lib/multi.c')
| -rw-r--r-- | lib/multi.c | 4 |
1 files changed, 1 insertions, 3 deletions
diff --git a/lib/multi.c b/lib/multi.c index 56b3faf2f..d8121250c 100644 --- a/lib/multi.c +++ b/lib/multi.c @@ -761,10 +761,8 @@ CURLMcode curl_multi_remove_handle(struct Curl_multi *multi, vanish with this handle */ /* Remove the association between the connection and the handle */ - if(data->easy_conn) { - data->easy_conn->data = NULL; + if(data->easy_conn) data->easy_conn = NULL; - } #ifdef USE_LIBPSL /* Remove the PSL association. */ |