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

This commit is contained in:
teor 2019-03-26 16:56:45 +10:00
commit 828033001b
No known key found for this signature in database
GPG Key ID: 10FEAA0E7075672A
2 changed files with 4 additions and 1 deletions

3
changes/cid1444119 Normal file
View File

@ -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.

View File

@ -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();