diff options
| author | teor <teor@torproject.org> | 2019-08-12 09:38:46 +1000 |
|---|---|---|
| committer | teor <teor@torproject.org> | 2019-08-12 09:38:46 +1000 |
| commit | 3287cae68c8e6f2f72967bf6fb07e601792ecd2c (patch) | |
| tree | cc4f4010f364cc331f970dcf4d26c16ded135f05 | |
| parent | a57e168caa21f9798be85adb56af726da7385810 (diff) | |
| parent | 669ec64325fde2f145b1798ee04c5fb74313b0e8 (diff) | |
| download | tor-3287cae68c8e6f2f72967bf6fb07e601792ecd2c.tar.gz tor-3287cae68c8e6f2f72967bf6fb07e601792ecd2c.zip | |
Merge remote-tracking branch 'tor-github/pr/848' into maint-0.3.5
| -rw-r--r-- | changes/cid1444119 | 3 | ||||
| -rw-r--r-- | src/feature/dircommon/consdiff.c | 2 |
2 files changed, 4 insertions, 1 deletions
diff --git a/changes/cid1444119 b/changes/cid1444119 new file mode 100644 index 0000000000..bb6854e66f --- /dev/null +++ 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 index 785205cb6f..d0f7594ce3 100644 --- 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(); |