diff options
| author | Nick Mathewson <nickm@torproject.org> | 2007-05-29 19:54:51 +0000 |
|---|---|---|
| committer | Nick Mathewson <nickm@torproject.org> | 2007-05-29 19:54:51 +0000 |
| commit | 1359871c1459a1de5a5e3bc55e752064b8ec4716 (patch) | |
| tree | 6569ae98ab8d7dca447cfefaf8707e4d912bca36 /src/or/circuituse.c | |
| parent | 3f9afa06250febe954c8bcebbea3a21c398e89a1 (diff) | |
| download | tor-1359871c1459a1de5a5e3bc55e752064b8ec4716.tar.gz tor-1359871c1459a1de5a5e3bc55e752064b8ec4716.zip | |
r13070@catbus: nickm | 2007-05-29 15:53:21 -0400
Fix handling of resolves with very long or otherwise malformed addresses, and comment dns_resolve better, and stop making what should be a BUG warning into an assert(0). This fixes bug 427, which was introduced around 9900/9931/9932. Not a backport candidate: 0.1.2.x never had this bug.
svn:r10399
Diffstat (limited to 'src/or/circuituse.c')
| -rw-r--r-- | src/or/circuituse.c | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/src/or/circuituse.c b/src/or/circuituse.c index 9c4867f09b..684a057def 100644 --- a/src/or/circuituse.c +++ b/src/or/circuituse.c @@ -536,8 +536,9 @@ circuit_detach_stream(circuit_t *circ, edge_connection_t *conn) } } - log_err(LD_BUG,"edge conn not in circuit's list?"); - tor_assert(0); /* should never get here */ + log_warn(LD_BUG,"Edge connection not in circuit's list."); + /* Don't give an error here; it's harmless. */ + // tor_fragile_assert(); } /** Find each circuit that has been unused for too long, or dirty |