diff options
| author | Nick Mathewson <nickm@torproject.org> | 2016-09-20 19:30:38 -0400 |
|---|---|---|
| committer | Nick Mathewson <nickm@torproject.org> | 2016-09-20 19:30:38 -0400 |
| commit | a8b607bfddd1acf2896cb12dd80389e4b1d66a24 (patch) | |
| tree | b0e61ef6894e3c46ca3ee469f4be2d997bf6a823 | |
| parent | f527a809b3adbb1379465f2c5c7238502c2f3877 (diff) | |
| parent | 9ebe202da0c56ed6c006a0410a636a9e99d111f7 (diff) | |
| download | tor-a8b607bfddd1acf2896cb12dd80389e4b1d66a24.tar.gz tor-a8b607bfddd1acf2896cb12dd80389e4b1d66a24.zip | |
Merge branch 'maint-0.2.8' into release-0.2.8
| -rw-r--r-- | changes/bug20103 | 7 | ||||
| -rw-r--r-- | src/or/networkstatus.c | 24 |
2 files changed, 20 insertions, 11 deletions
diff --git a/changes/bug20103 b/changes/bug20103 new file mode 100644 index 0000000000..c2b81d3797 --- /dev/null +++ b/changes/bug20103 @@ -0,0 +1,7 @@ + o Major bug fixes (crash): + + - Fix a complicated crash bug that could affect Tor clients + configured to use bridges when replacing a networkstatus consensus + in which one of their bridges was mentioned. OpenBSD users saw + more crashes here, but all platforms were potentially affected. + Fixes bug 20103; bugfix on 0.2.8.2-alpha. diff --git a/src/or/networkstatus.c b/src/or/networkstatus.c index 51fc01108f..1cedfef9b7 100644 --- a/src/or/networkstatus.c +++ b/src/or/networkstatus.c @@ -1631,7 +1631,9 @@ networkstatus_set_current_consensus(const char *consensus, if (r != 1 && dl_certs) authority_certs_fetch_missing(c, now); - if (flav == usable_consensus_flavor()) { + const int is_usable_flavor = flav == usable_consensus_flavor(); + + if (is_usable_flavor) { notify_control_networkstatus_changed(current_consensus, c); } if (flav == FLAV_NS) { @@ -1674,20 +1676,12 @@ networkstatus_set_current_consensus(const char *consensus, } } - /* Reset the failure count only if this consensus is actually valid. */ - if (c->valid_after <= now && now <= c->valid_until) { - download_status_reset(&consensus_dl_status[flav]); - } else { - if (!from_cache) - download_status_failed(&consensus_dl_status[flav], 0); - } + if (is_usable_flavor) { + nodelist_set_consensus(c); - if (flav == usable_consensus_flavor()) { /* XXXXNM Microdescs: needs a non-ns variant. ???? NM*/ update_consensus_networkstatus_fetch_time(now); - nodelist_set_consensus(current_consensus); - dirvote_recalculate_timing(options, now); routerstatus_list_update_named_server_map(); @@ -1711,6 +1705,14 @@ networkstatus_set_current_consensus(const char *consensus, current_consensus); } + /* Reset the failure count only if this consensus is actually valid. */ + if (c->valid_after <= now && now <= c->valid_until) { + download_status_reset(&consensus_dl_status[flav]); + } else { + if (!from_cache) + download_status_failed(&consensus_dl_status[flav], 0); + } + if (directory_caches_dir_info(options)) { dirserv_set_cached_consensus_networkstatus(consensus, flavor, |