[tor-commits] [tor/master] Fix crash bug (3361) when setting off-flavor networkstatus

[nickm at torproject.org]

commit d696bd1bfc3b61943ae4a2be8e4a9fcdfeaec246
Author: Nick Mathewson <nickm at torproject.org>
Date:   Tue Jun 7 14:46:28 2011 -0400

    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.
---
 changes/bug3361        |    4 ++++
 src/or/networkstatus.c |    2 +-
 2 files changed, 5 insertions(+), 1 deletions(-)

diff --git a/changes/bug3361 b/changes/bug3361
new file mode 100644
index 0000000..06bd954
--- /dev/null
+++ b/changes/bug3361
@@ -0,0 +1,4 @@
+  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.
diff --git a/src/or/networkstatus.c b/src/or/networkstatus.c
index 837c8c2..ab1358b 100644
--- a/src/or/networkstatus.c
+++ b/src/or/networkstatus.c
@@ -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;