aboutsummaryrefslogtreecommitdiff
path: root/src/or/routerlist.c
diff options
context:
space:
mode:
authorRoger Dingledine <arma@torproject.org>2004-11-03 10:08:44 +0000
committerRoger Dingledine <arma@torproject.org>2004-11-03 10:08:44 +0000
commite541319dcb7fef110a2348cc22255786f1571ca8 (patch)
tree324b27c6221e9063f43e3658412446d05b25a0ac /src/or/routerlist.c
parent5253405dfc6e0f5fd7d042bee55a3a96256ce141 (diff)
downloadtor-e541319dcb7fef110a2348cc22255786f1571ca8.tar
tor-e541319dcb7fef110a2348cc22255786f1571ca8.tar.gz
lay the groundwork for a default value for each config option.
tolerate null exitnodes, entrynodes, etc config options. svn:r2655
Diffstat (limited to 'src/or/routerlist.c')
-rw-r--r--src/or/routerlist.c6
1 files changed, 4 insertions, 2 deletions
diff --git a/src/or/routerlist.c b/src/or/routerlist.c
index abca6d4d5..0460de283 100644
--- a/src/or/routerlist.c
+++ b/src/or/routerlist.c
@@ -293,8 +293,9 @@ add_nickname_list_to_smartlist(smartlist_t *sl, const char *list, int warn_if_do
routerinfo_t *router;
smartlist_t *nickname_list;
+ if(!list)
+ return; /* nothing to do */
tor_assert(sl);
- tor_assert(list);
nickname_list = smartlist_create();
@@ -330,8 +331,9 @@ router_nickname_is_in_list(routerinfo_t *router, const char *list)
smartlist_t *nickname_list;
int v = 0;
+ if(!list)
+ return 0; /* definitely not */
tor_assert(router);
- tor_assert(list);
nickname_list = smartlist_create();
smartlist_split_string(nickname_list, list, ",",