Commit 55e052b0 authored by Roger Dingledine's avatar Roger Dingledine
Browse files

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
parent 4a3b7496

ChangeLog

+4 −0
Original line number Diff line number Diff line
@@ -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)

src/or/routerlist.c

+1 −0
Original line number Diff line number Diff line
@@ -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;

  }