Commit fd8ef8dc authored by Nick Mathewson's avatar Nick Mathewson 🤹
Browse files

Merge remote-tracking branch 'public/bug8208'

parents 43d2f99d e3578d52

changes/bug8208

0 → 100644
+4 −0
Original line number Diff line number Diff line 
  o Minor bugfixes:

    - Avoid a crash if we fail to generate an extrinfo descriptor.

      Fixes bug 8208; bugfix on 0.2.3.16-alpha. Found by Coverity;

      this is CID 718634.

src/or/router.c

+6 −2
Original line number Diff line number Diff line
@@ -1942,9 +1942,13 @@ router_rebuild_descriptor(int force) 
       anyway, since they don't have a DirPort, and always connect to the

       bridge authority anonymously.  But just in case they somehow think of

       sending them on an unencrypted connection, don't allow them to try. */

    ri->cache_info.send_unencrypted = ei->cache_info.send_unencrypted = 0;

    ri->cache_info.send_unencrypted = 0;

    if (ei)

      ei->cache_info.send_unencrypted = 0

  } else {

    ri->cache_info.send_unencrypted = ei->cache_info.send_unencrypted = 1;

    ri->cache_info.send_unencrypted = 1;

    if (ei)

      ei->cache_info.send_unencrypted = 1;

  }



  router_get_router_hash(ri->cache_info.signed_descriptor_body,