[or-cvs] r13153: Assert error introduced in r11957: Fix an assert if we post (in tor/trunk: . src/or)

[arma at seul.org]

Author: arma
Date: 2008-01-17 00:25:21 -0500 (Thu, 17 Jan 2008)
New Revision: 13153

Modified:
   tor/trunk/ChangeLog
   tor/trunk/src/or/routerlist.c
Log:
Assert error introduced in r11957:
Fix an assert if we post a general-purpose descriptor via the
control port but that descriptor isn't mentioned in our current
network consensus. Bug reported by Jon McLachlan; bugfix on
0.2.0.9-alpha.


Modified: tor/trunk/ChangeLog
===================================================================
--- tor/trunk/ChangeLog	2008-01-16 20:03:14 UTC (rev 13152)
+++ tor/trunk/ChangeLog	2008-01-17 05:25:21 UTC (rev 13153)
@@ -64,6 +64,10 @@
     - Fix a small memory leak when setting up a hidden service.
     - Fix a few memory leaks that could in theory happen under bizarre error
       conditions.
+    - Fix an assert if we post a general-purpose descriptor via the
+      control port but that descriptor isn't mentioned in our current
+      network consensus. Bug reported by Jon McLachlan; bugfix on
+      0.2.0.9-alpha.
 
   o Minor features (controller):
     - Get NS events working again.  (Patch from tup)

Modified: tor/trunk/src/or/routerlist.c
===================================================================
--- tor/trunk/src/or/routerlist.c	2008-01-16 20:03:14 UTC (rev 13152)
+++ tor/trunk/src/or/routerlist.c	2008-01-17 05:25:21 UTC (rev 13153)
@@ -2721,6 +2721,7 @@
       signed_desc_append_to_journal(&router->cache_info,
                                     &routerlist->desc_store);
     routerlist_insert_old(routerlist, router);
+    *msg = "Skipping router descriptor: not in consensus.";
     return -1;
   }