Commit d696bd1b authored by Nick Mathewson's avatar Nick Mathewson 🦀
Browse files

Fix crash bug (3361) when setting off-flavor networkstatus 

When we set a networkstatus in the non-preferred flavor, we'd check
the time in the current_consensus.  But that might have been NULL,
which could produce a crash as seen in bug 3361.
parent d25d08dc

changes/bug3361

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

    - Fix a crash bug that could occur when setting a consensus in a

      non-used flavor without having a current consensus set. Fixes bug

      3361; bugfix on 0.2.3.1-alpha.

src/or/networkstatus.c

+1 −1
Original line number Diff line number Diff line
@@ -1814,7 +1814,7 @@ networkstatus_set_current_consensus(const char *consensus, 
 * valid-after time, declare that our clock is skewed. */

#define EARLY_CONSENSUS_NOTICE_SKEW 60



  if (now < current_consensus->valid_after - EARLY_CONSENSUS_NOTICE_SKEW) {

  if (now < c->valid_after - EARLY_CONSENSUS_NOTICE_SKEW) {

    char tbuf[ISO_TIME_LEN+1];

    char dbuf[64];

    long delta = now - c->valid_after;