Unverified Commit 3287cae6 authored by teor's avatar teor
Browse files

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

parents a57e168c 669ec643
Loading
Loading
Loading
Loading

changes/cid1444119

0 → 100644
+3 −0
Original line number Diff line number Diff line
  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
Original line number Diff line number Diff line
@@ -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();