[or-cvs] r10388: More messing around to try to address possible root causes o (in tor/trunk: . src/or)

[nickm@xxxxxxxx]

Author: nickm
Date: 2007-05-29 10:41:20 -0400 (Tue, 29 May 2007)
New Revision: 10388

Modified:
   tor/trunk/
   tor/trunk/src/or/dirserv.c
   tor/trunk/src/or/routerlist.c
Log:
 r13041@catbus:  nickm | 2007-05-29 10:40:05 -0400
 More messing around to try to address possible root causes of bug 436.



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

Modified: tor/trunk/src/or/dirserv.c
===================================================================
--- tor/trunk/src/or/dirserv.c	2007-05-29 14:41:16 UTC (rev 10387)
+++ tor/trunk/src/or/dirserv.c	2007-05-29 14:41:20 UTC (rev 10388)
@@ -523,6 +523,7 @@
   smartlist_t *list;
   const char *s;
   int n_parsed = 0;
+  tor_assert(msg);
 
   s = desc;
   list = smartlist_create();

Modified: tor/trunk/src/or/routerlist.c
===================================================================
--- tor/trunk/src/or/routerlist.c	2007-05-29 14:41:16 UTC (rev 10387)
+++ tor/trunk/src/or/routerlist.c	2007-05-29 14:41:20 UTC (rev 10388)
@@ -2462,7 +2462,7 @@
 {
   int inserted;
   (void)from_fetch;
-  (void)msg;
+  if (msg) *msg = NULL;
 
   inserted = extrainfo_insert(router_get_routerlist(), ei);