aboutsummaryrefslogtreecommitdiff
path: root/src/or/consdiffmgr.c
diff options
context:
space:
mode:
authorNick Mathewson <nickm@torproject.org>2018-01-31 09:50:24 -0500
committerNick Mathewson <nickm@torproject.org>2018-01-31 09:50:24 -0500
commite81896adda197b705958bcbe2b9d2c5db839b8a5 (patch)
tree5e5739a4923da4229e3874c78687f9a32dabead6 /src/or/consdiffmgr.c
parentee5c624bebbc8e823ed49fe563fd56294fb226d4 (diff)
parent9c2bc441f8acf6fb47c7cc1f09c04974ee35d694 (diff)
downloadtor-e81896adda197b705958bcbe2b9d2c5db839b8a5.tar.gz
tor-e81896adda197b705958bcbe2b9d2c5db839b8a5.zip
Merge branch 'maint-0.3.1' into maint-0.3.2
Diffstat (limited to 'src/or/consdiffmgr.c')
-rw-r--r--src/or/consdiffmgr.c5
1 files changed, 4 insertions, 1 deletions
diff --git a/src/or/consdiffmgr.c b/src/or/consdiffmgr.c
index e539b61484..ab11d0c957 100644
--- a/src/or/consdiffmgr.c
+++ b/src/or/consdiffmgr.c
@@ -1310,8 +1310,11 @@ store_multiple(consensus_cache_entry_handle_t **handles_out,
labels,
body_out,
bodylen_out);
- if (BUG(ent == NULL))
+ if (ent == NULL) {
+ log_warn(LD_FS, "Unable to store object %s compressed with %s.",
+ description, methodname);
continue;
+ }
status = CDM_DIFF_PRESENT;
handles_out[i] = consensus_cache_entry_handle_new(ent);