From: Robert Hogan <robert@roberthogan.net>
Date: Sun, 12 Sep 2010 13:10:16 +0000 (+0100)
Subject: Handle null conn->requested_resource rather than assert
X-Git-Tag: tor-0.2.2.16-alpha~19^2~1
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=22ab997e8319fd0287c16ab8300d1bf69689f458;p=thirdparty%2Ftor.git

Handle null conn->requested_resource rather than assert

Per arma's comments in bug1138
---

diff --git a/src/or/directory.c b/src/or/directory.c
index de1422565a..388410c8af 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();