nihilist/tor
1
0
Fork 0
mirror of https://gitlab.torproject.org/tpo/core/tor.git synced 2024-11-28 14:23:30 +01:00
Code Issues Packages Projects Releases Wiki Activity

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

Browse Source 
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.
This commit is contained in:
Nick Mathewson 2011-06-07 14:46:28 -04:00
parent d25d08dc4d
commit d696bd1bfc
2 changed files with 5 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
changes/bug3361 Normal file
View File

@ -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.

2
src/or/networkstatus.c
View File

@ -1814,7 +1814,7 @@ networkstatus_set_current_consensus(const char *consensus,
* valid-after time, declare that our clock is skewed. */ * valid-after time, declare that our clock is skewed. */
#define EARLY_CONSENSUS_NOTICE_SKEW 60 #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 tbuf[ISO_TIME_LEN+1];
char dbuf[64]; char dbuf[64];
long delta = now - c->valid_after; long delta = now - c->valid_after;