tor

commit 68c21860e32ca04d77c2bfbf7576b96de5110f59
parent 3bb29dd707fbc825501c30ed9a6fe4aecdf4fd22
Author: Nick Mathewson <nickm@torproject.org>
Date:   Mon, 20 Nov 2017 11:04:44 -0500

Add another assertion to check for 24086 root causes

In cdm_diff_ht_set_status(), we shouldn't have been allowing the
status CDM_DIFF_PRESENT to be set if there wasn't actually a handle.

Diffstat:
M
src/or/consdiffmgr.c
 | 
4
++++

1 file changed, 4 insertions(+), 0 deletions(-)
diff --git a/src/or/consdiffmgr.c b/src/or/consdiffmgr.c
@@ -283,6 +283,10 @@ cdm_diff_ht_set_status(consensus_flavor_t flav,
                        int status,
                        consensus_cache_entry_handle_t *handle)
 {
+  if (handle == NULL) {
+    tor_assert_nonfatal(status != CDM_DIFF_PRESENT);
+  }
+
   struct cdm_diff_t search, *ent;
   memset(&search, 0, sizeof(cdm_diff_t));
   search.flavor = flav;