tor

commit 828033001bac114eaf94c3586520f0dce167d06c
parent 8bc3ac6a84a11adb728f4ce49f23414c27fe84cd
Author: teor <teor@torproject.org>
Date:   Tue, 26 Mar 2019 16:56:45 +1000

Merge remote-tracking branch 'tor-github/pr/848' into maint-0.4.0

Diffstat:
A
changes/cid1444119
 | 
3
+++
M
src/feature/dircommon/consdiff.c
 | 
2
+-

2 files changed, 4 insertions(+), 1 deletion(-)
diff --git a/changes/cid1444119 b/changes/cid1444119
@@ -0,0 +1,3 @@
+  o Minor bugfixes (C correctness):
+    - Fix an unlikely memory leak in consensus_diff_apply(). Fixes bug 29824;
+      bugfix on 0.3.1.1-alpha. This is Coverity warning CID 1444119.
diff --git a/src/feature/dircommon/consdiff.c b/src/feature/dircommon/consdiff.c
@@ -1389,7 +1389,7 @@ consensus_diff_apply(const char *consensus,
 
   r1 = consensus_compute_digest_as_signed(consensus, consensus_len, &d1);
   if (BUG(r1 < 0))
-    return NULL; // LCOV_EXCL_LINE
+    goto done;
 
   lines1 = smartlist_new();
   lines2 = smartlist_new();