aboutsummaryrefslogtreecommitdiff
path: root/src
diff options
context:
space:
mode:
authorNick Mathewson <nickm@torproject.org>2007-05-29 15:07:16 +0000
committerNick Mathewson <nickm@torproject.org>2007-05-29 15:07:16 +0000
commitfd3aa5c85d8dbae3663cefdb7be7de0d1c281a57 (patch)
tree2385b66f4334db9a69379cfb5910d632390a36cf /src
parent916e98d3fa3c8d1bfa3760ba5675e8f12bc9eab9 (diff)
downloadtor-fd3aa5c85d8dbae3663cefdb7be7de0d1c281a57.tar.gz
tor-fd3aa5c85d8dbae3663cefdb7be7de0d1c281a57.zip
r13046@catbus: nickm | 2007-05-29 11:07:12 -0400
Stop adding bogus entries to lists in router_parse_list_from_string(). I wonder which bugs _that_ caused. svn:r10390
Diffstat (limited to 'src')
-rw-r--r--src/or/routerparse.c4
1 files changed, 4 insertions, 0 deletions
diff --git a/src/or/routerparse.c b/src/or/routerparse.c
index 0ec34240c8..fc4438c952 100644
--- a/src/or/routerparse.c
+++ b/src/or/routerparse.c
@@ -905,11 +905,15 @@ router_parse_list_from_string(const char **s, const char *eos,
extrainfo = extrainfo_parse_entry_from_string(*s, end,
saved_location != SAVED_IN_CACHE,
rl->identity_map);
+ if (!extrainfo)
+ continue;
signed_desc = &extrainfo->cache_info;
elt = extrainfo;
} else if (!have_extrainfo && !want_extrainfo) {
router = router_parse_entry_from_string(*s, end,
saved_location != SAVED_IN_CACHE);
+ if (!router)
+ continue;
signed_desc = &router->cache_info;
elt = router;
} else {