diff options
| author | Roger Dingledine <arma@torproject.org> | 2008-01-17 05:25:21 +0000 |
|---|---|---|
| committer | Roger Dingledine <arma@torproject.org> | 2008-01-17 05:25:21 +0000 |
| commit | 55e052b0a5f434f5d8b36f73384e357a9c5618e2 (patch) | |
| tree | d5eefc7791db922089f1984acb651e9dcb770477 | |
| parent | 4a3b7496f0c47b0d00c9744698eaa237e601b32a (diff) | |
| download | tor-55e052b0a5f434f5d8b36f73384e357a9c5618e2.tar.gz tor-55e052b0a5f434f5d8b36f73384e357a9c5618e2.zip | |
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
| -rw-r--r-- | ChangeLog | 4 | ||||
| -rw-r--r-- | src/or/routerlist.c | 1 |
2 files changed, 5 insertions, 0 deletions
@@ -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; } |