diff options
| author | teor <teor@torproject.org> | 2019-03-26 16:56:45 +1000 |
|---|---|---|
| committer | teor <teor@torproject.org> | 2019-03-26 16:56:45 +1000 |
| commit | 828033001bac114eaf94c3586520f0dce167d06c (patch) | |
| tree | b1374a1bdfdffdfeac73423ae306038cd5cfb634 | |
| parent | 8bc3ac6a84a11adb728f4ce49f23414c27fe84cd (diff) | |
| parent | 669ec64325fde2f145b1798ee04c5fb74313b0e8 (diff) | |
| download | tor-828033001bac114eaf94c3586520f0dce167d06c.tar.gz tor-828033001bac114eaf94c3586520f0dce167d06c.zip | |
Merge remote-tracking branch 'tor-github/pr/848' into maint-0.4.0
| -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 698f548013..8e93953f73 100644 --- a/src/feature/dircommon/consdiff.c +++ b/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(); |