aboutsummaryrefslogtreecommitdiff
path: root/src/or
diff options
context:
space:
mode:
authorNick Mathewson <nickm@torproject.org>2004-10-14 02:29:03 +0000
committerNick Mathewson <nickm@torproject.org>2004-10-14 02:29:03 +0000
commit92bb360ad771a4cba21f1e4a77e367f973e546ef (patch)
tree329f70ae42cb81f5f621ddfd666f501a59ddb805 /src/or
parent8b325c142edce4baea24ac229a55c2663f63c12f (diff)
downloadtor-92bb360ad771a4cba21f1e4a77e367f973e546ef.tar
tor-92bb360ad771a4cba21f1e4a77e367f973e546ef.tar.gz
Add missing line; add similar check
svn:r2481
Diffstat (limited to 'src/or')
-rw-r--r--src/or/routerlist.c5
1 files changed, 4 insertions, 1 deletions
diff --git a/src/or/routerlist.c b/src/or/routerlist.c
index e942e9623..aa6a74572 100644
--- a/src/or/routerlist.c
+++ b/src/or/routerlist.c
@@ -77,7 +77,7 @@ routerinfo_t *router_pick_directory_server(int requireothers) {
routerinfo_t *choice;
if (!routerlist)
-
+ return NULL;
choice = router_pick_directory_server_impl(requireothers, options.FascistFirewall);
if(choice)
@@ -176,6 +176,9 @@ router_pick_trusteddirserver_impl(int requireother, int fascistfirewall)
sl = smartlist_create();
me = router_get_my_routerinfo();
+ if (!trusted_dir_servers)
+ return NULL;
+
SMARTLIST_FOREACH(trusted_dir_servers, trusted_dir_server_t *, d,
{
if (!d->is_running) continue;