aboutsummaryrefslogtreecommitdiff
path: root/src/or/circuitlist.c
diff options
context:
space:
mode:
authorRoger Dingledine <arma@torproject.org>2004-05-21 12:25:15 +0000
committerRoger Dingledine <arma@torproject.org>2004-05-21 12:25:15 +0000
commitf51061439b086e5eef460023a02893cfb8931d65 (patch)
tree16d2e1c12715fa89aafbe7f8a71bfc41e0bc00eb /src/or/circuitlist.c
parent3532ba8177dc79a5f5ee014403e5d747ef1a12cd (diff)
downloadtor-f51061439b086e5eef460023a02893cfb8931d65.tar
tor-f51061439b086e5eef460023a02893cfb8931d65.tar.gz
when the dns resolve is cancelled, or fails, be sure to remove
conn from circ->resolving_streams otherwise it gets freed and stays there, causing seg faults. svn:r1915
Diffstat (limited to 'src/or/circuitlist.c')
-rw-r--r--src/or/circuitlist.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/src/or/circuitlist.c b/src/or/circuitlist.c
index 9cdfb809b..e87931f52 100644
--- a/src/or/circuitlist.c
+++ b/src/or/circuitlist.c
@@ -200,7 +200,7 @@ circuit_t *circuit_get_by_circ_id_conn(uint16_t circ_id, connection_t *conn) {
}
/** Return a circ such that circ is attached to <b>conn</b>, either as
- * p_conn, n-conn, or in p_streams or n_streams.
+ * p_conn, n-conn, or in p_streams or n_streams or resolving_streams.
*
* Return NULL if no such circuit exists.
*/