From 1852f503cf1463acb25d9e8d445cb2420ba59433 Mon Sep 17 00:00:00 2001
From: Nick Mathewson <nickm@torproject.org>
Date: Tue, 12 Sep 2006 02:50:14 +0000
Subject:  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
---
 src/or/control.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'src')

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;
-- 
cgit v1.2.3