r12718@catbus: nickm | 2007-05-10 15:24:05 -0400

Backport 10052+10053: avoid rare memory corruption on dirserver.


svn:r10159

ChangeLog

@@ -5,6 +5,10 @@ Changes in version 0.1.2.14 - 2007-0?-??
       but leave it attached to the circuit, leading to unpredictable
       behavior. (Reported by seeess, fixes bug 425.)
 
+  o Major bugfixes:
+    - Fix a bug in dirserv_remove_invalid() that would cause authorities to
+      corrupt memory under some really unlikely scenarios.
+
 
 Changes in version 0.1.2.13 - 2007-04-24
   o Minor fixes:

src/or/dirserv.c

@@ -610,6 +610,7 @@ directory_remove_invalid(void)
                ent->nickname, msg?msg:"");
       routerlist_remove(rl, ent, i--, 0);
       changed = 1;
+      continue;
     }
     if (bool_neq((r & FP_NAMED), ent->is_named)) {
       log_info(LD_DIRSERV,

src/or/routerlist.c

@@ -4482,7 +4482,7 @@ routerlist_assert_ok(routerlist_t *rl)
   digestmap_iter_t *iter;
   routerinfo_t *r2;
   signed_descriptor_t *sd2;
-  if (!routerlist)
+  if (!rl)
     return;
   SMARTLIST_FOREACH(rl->routers, routerinfo_t *, r,
   {