From 55e052b0a5f434f5d8b36f73384e357a9c5618e2 Mon Sep 17 00:00:00 2001 From: Roger Dingledine Date: Thu, 17 Jan 2008 05:25:21 +0000 Subject: [PATCH] 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. svn:r13153 --- ChangeLog | 4 ++++ src/or/routerlist.c | 1 + 2 files changed, 5 insertions(+) diff --git a/ChangeLog b/ChangeLog index 6cc17d1ac1..7b34d541e3 100644 --- a/ChangeLog +++ b/ChangeLog @@ -64,6 +64,10 @@ Changes in version 0.2.0.16-alpha - 2008-01-?? - 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) diff --git a/src/or/routerlist.c b/src/or/routerlist.c index 5a16062f5e..7097cb64dd 100644 --- a/src/or/routerlist.c +++ b/src/or/routerlist.c @@ -2721,6 +2721,7 @@ router_add_to_routerlist(routerinfo_t *router, const char **msg, 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; } -- 2.11.4.GIT