[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[GNUnet-SVN] [gnurl] 92/205: multi: fix streamclose() crash in debug mod
From: |
gnunet |
Subject: |
[GNUnet-SVN] [gnurl] 92/205: multi: fix streamclose() crash in debug mode |
Date: |
Thu, 20 Apr 2017 16:20:32 +0200 |
This is an automated email from the git hooks/post-receive script.
ng0 pushed a commit to annotated tag gnurl-7.54.0
in repository gnurl.
commit 6e0f26c8a8c28dffd3bc8738cd93ed9ca8e098c8
Author: Daniel Stenberg <address@hidden>
AuthorDate: Tue Mar 21 10:09:11 2017 +0100
multi: fix streamclose() crash in debug mode
The code would refer to the wrong data pointer. Only debug builds do
this - for verbosity.
Reported-by: address@hidden
Fixes #1329
---
lib/multi.c | 8 ++++----
1 file changed, 4 insertions(+), 4 deletions(-)
diff --git a/lib/multi.c b/lib/multi.c
index f16b594e0..6cdba393e 100644
--- a/lib/multi.c
+++ b/lib/multi.c
@@ -5,7 +5,7 @@
* | (__| |_| | _ <| |___
* \___|\___/|_| \_\_____|
*
- * Copyright (C) 1998 - 2016, Daniel Stenberg, <address@hidden>, et al.
+ * Copyright (C) 1998 - 2017, Daniel Stenberg, <address@hidden>, et al.
*
* This software is licensed as described in the file COPYING, which
* you should have received as part of this distribution. The terms
@@ -695,13 +695,13 @@ CURLMcode curl_multi_remove_handle(struct Curl_multi
*multi,
if(data->easy_conn &&
data->mstate > CURLM_STATE_DO &&
data->mstate < CURLM_STATE_COMPLETED) {
+ /* Set connection owner so that the DONE function closes it. We can
+ safely do this here since connection is killed. */
+ data->easy_conn->data = easy;
/* If the handle is in a pipeline and has started sending off its
request but not received its response yet, we need to close
connection. */
streamclose(data->easy_conn, "Removed with partial response");
- /* Set connection owner so that the DONE function closes it. We can
- safely do this here since connection is killed. */
- data->easy_conn->data = easy;
easy_owns_conn = TRUE;
}
--
To stop receiving notification emails like this one, please contact
address@hidden
- [GNUnet-SVN] [gnurl] 83/205: CURLINFO_LOCAL_PORT.3: added example, (continued)
- [GNUnet-SVN] [gnurl] 83/205: CURLINFO_LOCAL_PORT.3: added example, gnunet, 2017/04/20
- [GNUnet-SVN] [gnurl] 79/205: build: removed redundant DEPENDENCIES from makefiles, gnunet, 2017/04/20
- [GNUnet-SVN] [gnurl] 82/205: SSLCERTS.md: mention HTTPS proxies and their separate options, gnunet, 2017/04/20
- [GNUnet-SVN] [gnurl] 53/205: bump: next release will be known as 7.54.0, gnunet, 2017/04/20
- [GNUnet-SVN] [gnurl] 71/205: tool_writeout: fixed a buffer read overrun on --write-out, gnunet, 2017/04/20
- [GNUnet-SVN] [gnurl] 87/205: tests: strip more options from non-HTTP --libcurl tests, gnunet, 2017/04/20
- [GNUnet-SVN] [gnurl] 84/205: CURLINFO_LOCAL_PORT.3: fix typo, gnunet, 2017/04/20
- [GNUnet-SVN] [gnurl] 39/205: ares: better error return on timeouts, gnunet, 2017/04/20
- [GNUnet-SVN] [gnurl] 109/205: openssl: fix comparison between signed and unsigned integer expressions, gnunet, 2017/04/20
- [GNUnet-SVN] [gnurl] 80/205: KNOWN_BUGS: remove libidn related issue, gnunet, 2017/04/20
- [GNUnet-SVN] [gnurl] 92/205: multi: fix streamclose() crash in debug mode,
gnunet <=
- [GNUnet-SVN] [gnurl] 66/205: proxy: skip SSL initialization for closed connections, gnunet, 2017/04/20
- [GNUnet-SVN] [gnurl] 75/205: make: regenerate docs/curl.1 by runinng make in docs, gnunet, 2017/04/20
- [GNUnet-SVN] [gnurl] 100/205: test2033: flaky, gnunet, 2017/04/20
- [GNUnet-SVN] [gnurl] 89/205: tests: fixed the documented test server port numbers, gnunet, 2017/04/20
- [GNUnet-SVN] [gnurl] 101/205: make: introduce 'test-nonflaky' target, gnunet, 2017/04/20
- [GNUnet-SVN] [gnurl] 72/205: test1287: added verbose logs keyword, gnunet, 2017/04/20
- [GNUnet-SVN] [gnurl] 76/205: RELEASE-NOTES: synced with c25e0761d0fc49c4, gnunet, 2017/04/20
- [GNUnet-SVN] [gnurl] 52/205: openssl: unbreak the build after 6448f98c1857de, gnunet, 2017/04/20
- [GNUnet-SVN] [gnurl] 91/205: CONTRIBUTE: mention referring to github issues in commit msgs, gnunet, 2017/04/20
- [GNUnet-SVN] [gnurl] 86/205: darwinssl: fix typo in variable name, gnunet, 2017/04/20