Quellcode durchsuchen

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

teor vor 5 Jahren
Ursprung
Commit
828033001b
2 geänderte Dateien mit 4 neuen und 1 gelöschten Zeilen
  1. 3 0
      changes/cid1444119
  2. 1 1
      src/feature/dircommon/consdiff.c

+ 3 - 0
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.

+ 1 - 1
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();