Commit c98faa1a authored by Sebastian Hahn's avatar Sebastian Hahn
Browse files

Resolve a crash when running as dirauth 

When we're asked for our own descriptor, don't crash.
parent c58f4a86

changes/bridgeauth_crash

0 → 100644
+4 −0
Changes for changes/bridgeauth_crash: 4 added lines, 0 removed lines.
Original line number Diff line number Diff line 
  o Major bugfixes:

    - Don't crash when we, as the bridge authority, are asked for our own

      descriptor. Bugfix on 0.2.3.7-alpha, reported by Lucky.

src/or/dirserv.c

+3 −2
Changes for src/or/dirserv.c: 3 added lines, 2 removed lines.
Original line number Diff line number Diff line
@@ -3590,8 +3590,9 @@ connection_dirserv_add_servers_to_outbuf(dir_connection_t *conn) 
    if (options->BridgeAuthoritativeDir && by_fp) {

      const routerinfo_t *router =

          router_get_by_id_digest(sd->identity_digest);

      tor_assert(router);

      if (router->purpose == ROUTER_PURPOSE_BRIDGE)

      /* router can be NULL here when the bridge auth is asked for its own

       * descriptor. */

      if (router && router->purpose == ROUTER_PURPOSE_BRIDGE)

        rep_hist_note_desc_served(sd->identity_digest);

    }

    body = signed_descriptor_get_body(sd);