diff options
| author | Nick Mathewson <nickm@torproject.org> | 2017-06-28 14:21:21 -0400 |
|---|---|---|
| committer | Nick Mathewson <nickm@torproject.org> | 2017-06-28 14:21:21 -0400 |
| commit | de5f0d8ba7156e9579cc52898cbe0b3a25f64aad (patch) | |
| tree | cabb7e61b4df8e2da1e7a78fce8312ffa51ee52a | |
| parent | 912f366bd5597de6da7d48168d1ed1302702cae3 (diff) | |
| download | tor-de5f0d8ba7156e9579cc52898cbe0b3a25f64aad.tar.gz tor-de5f0d8ba7156e9579cc52898cbe0b3a25f64aad.zip | |
Replace crash on missing handle in consdiffmgr with nonfatal assert
Attempts to mitigate 22752.
| -rw-r--r-- | src/or/consdiffmgr.c | 6 |
1 files changed, 5 insertions, 1 deletions
diff --git a/src/or/consdiffmgr.c b/src/or/consdiffmgr.c index 4036f665f9..638fcd6794 100644 --- a/src/or/consdiffmgr.c +++ b/src/or/consdiffmgr.c @@ -325,7 +325,8 @@ cdm_diff_ht_purge(consensus_flavor_t flav, if ((*diff)->cdm_diff_status == CDM_DIFF_PRESENT && flav == (*diff)->flavor) { - if (consensus_cache_entry_handle_get((*diff)->entry) == NULL) { + if (BUG((*diff)->entry == NULL) || + consensus_cache_entry_handle_get((*diff)->entry) == NULL) { /* the underlying entry has gone away; drop this. */ next = HT_NEXT_RMV(cdm_diff_ht, &cdm_diff_ht, diff); cdm_diff_free(this); @@ -622,6 +623,9 @@ consdiffmgr_find_diff_from(consensus_cache_entry_t **entry_out, return CONSDIFF_IN_PROGRESS; } + if (BUG(ent->entry == NULL)) { + return CONSDIFF_NOT_FOUND; + } *entry_out = consensus_cache_entry_handle_get(ent->entry); return (*entry_out) ? CONSDIFF_AVAILABLE : CONSDIFF_NOT_FOUND; |