tor

The Tor anonymity network
git clone https://git.dasho.dev/tor.git
Log | Files | Refs | README | LICENSE
commit 3287cae68c8e6f2f72967bf6fb07e601792ecd2c
parent a57e168caa21f9798be85adb56af726da7385810
Author: teor <teor@torproject.org>
Date:   Mon, 12 Aug 2019 09:38:46 +1000

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

Diffstat:

Achanges/cid1444119 | 3+++


Msrc/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
@@ -1385,7 +1385,7 @@ consensus_diff_apply(const char *consensus,
 
   r1 = consensus_compute_digest_as_signed(consensus, &d1);
   if (BUG(r1 < 0))
-    return NULL; // LCOV_EXCL_LINE
+    goto done;
 
   lines1 = smartlist_new();
   lines2 = smartlist_new();