diff options
| author | Robert Hogan <robert@roberthogan.net> | 2010-09-12 14:10:16 +0100 |
|---|---|---|
| committer | Robert Hogan <robert@roberthogan.net> | 2010-09-12 14:10:16 +0100 |
| commit | 22ab997e8319fd0287c16ab8300d1bf69689f458 (patch) | |
| tree | ee18f35b346f239f7e6953bb9327a1ba8ebc12b8 | |
| parent | 5799cdd9d326740d79ec8a30b3ace90d0bda346e (diff) | |
| download | tor-22ab997e8319fd0287c16ab8300d1bf69689f458.tar.gz tor-22ab997e8319fd0287c16ab8300d1bf69689f458.zip | |
Handle null conn->requested_resource rather than assert
Per arma's comments in bug1138
| -rw-r--r-- | 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 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(); |