[or-cvs] r10390: Stop adding bogus entries to lists in router_parse_list_from (in tor/trunk: . src/or)

[nickm at seul.org]

Author: nickm
Date: 2007-05-29 11:07:16 -0400 (Tue, 29 May 2007)
New Revision: 10390

Modified:
   tor/trunk/
   tor/trunk/src/or/routerparse.c
Log:
 r13046 at 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.



Property changes on: tor/trunk
___________________________________________________________________
 svk:merge ticket from /tor/trunk [r13046] on 8246c3cf-6607-4228-993b-4d95d33730f1

Modified: tor/trunk/src/or/routerparse.c
===================================================================
--- tor/trunk/src/or/routerparse.c	2007-05-29 14:41:24 UTC (rev 10389)
+++ tor/trunk/src/or/routerparse.c	2007-05-29 15:07:16 UTC (rev 10390)
@@ -905,11 +905,15 @@
       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 {