From fd3aa5c85d8dbae3663cefdb7be7de0d1c281a57 Mon Sep 17 00:00:00 2001
From: Nick Mathewson <nickm@torproject.org>
Date: Tue, 29 May 2007 15:07:16 +0000
Subject: [PATCH]  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
---
 src/or/routerparse.c | 4 ++++
 1 file changed, 4 insertions(+)

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 {