[or-cvs] [tor/master 4/6] Handle null conn->requested_resource rather than assert

[nickm@xxxxxxxxxxxxxx]

Author: Robert Hogan <robert@xxxxxxxxxxxxxxx>
Date: Sun, 12 Sep 2010 14:10:16 +0100
Subject: Handle null conn->requested_resource rather than assert
Commit: 22ab997e8319fd0287c16ab8300d1bf69689f458

Per arma's comments in bug1138
---
 src/or/directory.c |    2 +-
 1 files changed, 1 insertions(+), 1 deletions(-)

diff --git a/src/or/directory.c b/src/or/directory.c
index de14225..388410c 100644
--- a/src/or/directory.c
+++ b/src/or/directory.c
@@ -696,7 +696,7 @@ connection_dir_bridge_routerdesc_failed(dir_connection_t *conn)
   tor_assert(conn->requested_resource);
   /* Requests for bridge descriptors are in the form 'fp/', so ignore
      anything else. */
-  if (conn->requested_resource && strcmpstart(conn->requested_resource,"fp/"))
+  if (!conn->requested_resource || strcmpstart(conn->requested_resource,"fp/"))
     return;
 
   which = smartlist_create();
-- 
1.7.1