torproject/tor
1
0
Fork 0
mirror of https://gitlab.torproject.org/tpo/core/tor.git synced 2024-12-06 19:41:15 +01:00
Code Issues Actions Packages Projects Releases Wiki Activity

Merge branch 'bug27772_squashed'

Browse Source
This commit is contained in:
Nick Mathewson
2018-10-14 15:31:52 -04:00
parent 2c5c17510a 6925b61cfd
commit 2dccef0eb4
16 changed files with 79 additions and 58 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/core/mainloop/connection.c
+6 -5
View File
@@ -660,14 +660,15 @@ connection_free_minimal(connection_t *conn)
tor_free(or_conn->nickname);
if (or_conn->chan) {
/* Owww, this shouldn't happen, but... */
channel_t *base_chan = TLS_CHAN_TO_BASE(or_conn->chan);
tor_assert(base_chan);
log_info(LD_CHANNEL,
"Freeing orconn at %p, saw channel %p with ID "
"%"PRIu64 " left un-NULLed",
or_conn, TLS_CHAN_TO_BASE(or_conn->chan),
(
TLS_CHAN_TO_BASE(or_conn->chan)->global_identifier));
if (!CHANNEL_FINISHED(TLS_CHAN_TO_BASE(or_conn->chan))) {
channel_close_for_error(TLS_CHAN_TO_BASE(or_conn->chan));
or_conn, base_chan,
base_chan->global_identifier);
if (!CHANNEL_FINISHED(base_chan)) {
channel_close_for_error(base_chan);
}
or_conn->chan->conn = NULL;