diff options
| author | Nick Mathewson <nickm@torproject.org> | 2006-09-12 02:50:14 +0000 |
|---|---|---|
| committer | Nick Mathewson <nickm@torproject.org> | 2006-09-12 02:50:14 +0000 |
| commit | 1852f503cf1463acb25d9e8d445cb2420ba59433 (patch) | |
| tree | 614d61841d3fa1f86c473428d5b174191c2063f1 /src | |
| parent | 8170f1e0370df9c9e3c0d3542b021f47da561684 (diff) | |
| download | tor-1852f503cf1463acb25d9e8d445cb2420ba59433.tar tor-1852f503cf1463acb25d9e8d445cb2420ba59433.tar.gz | |
r8776@Kushana: nickm | 2006-09-11 22:49:53 -0400
Avoid crash when telling controller stream-status and a stream is detached. Fixes bug 334. Backport candidate.
svn:r8370
Diffstat (limited to 'src')
| -rw-r--r-- | src/or/control.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/src/or/control.c b/src/or/control.c index 214f0ef7c..3b06fd145 100644 --- a/src/or/control.c +++ b/src/or/control.c @@ -1453,7 +1453,7 @@ handle_getinfo_helper(const char *question, char **answer) continue; } circ = circuit_get_by_edge_conn(conn); - if (CIRCUIT_IS_ORIGIN(circ)) + if (circ && CIRCUIT_IS_ORIGIN(circ)) origin_circ = TO_ORIGIN_CIRCUIT(circ); write_stream_target_to_buf(conn, buf, sizeof(buf)); slen = strlen(buf)+strlen(state)+32; |