summaryrefslogtreecommitdiff
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
commit69e242f845fa53ee0930127dc9dccae8ca5c70e8 (patch)
tree2369039ddd0f3574635355b483a663b598b7e6ea /src/or/consdiffmgr.c
parent914ec372a9352308c3990afb5304f7e8d39b1020 (diff)
parente81896adda197b705958bcbe2b9d2c5db839b8a5 (diff)
downloadtor-69e242f845fa53ee0930127dc9dccae8ca5c70e8.tar.gz
tor-69e242f845fa53ee0930127dc9dccae8ca5c70e8.zip
Merge branch '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 38d901a3ae..eb862192d4 100644
--- a/src/or/consdiffmgr.c
+++ b/src/or/consdiffmgr.c
@@ -1313,8 +1313,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);