diff options
| author | Nick Mathewson <nickm@torproject.org> | 2013-04-18 11:26:54 -0400 |
|---|---|---|
| committer | Nick Mathewson <nickm@torproject.org> | 2013-04-18 11:26:54 -0400 |
| commit | 06efbbb47ef28dd24cb4482f5b82204918891f41 (patch) | |
| tree | fc8779c441219c645326d80a7d22827d48823839 | |
| parent | 9fec0c1a95ab24f5f18d6995e30fe2111e6b7db2 (diff) | |
| parent | cd2b508f4ec22e85104065058722293a951be200 (diff) | |
| download | tor-06efbbb47ef28dd24cb4482f5b82204918891f41.tar.gz tor-06efbbb47ef28dd24cb4482f5b82204918891f41.zip | |
Merge remote-tracking branch 'public/bug8719' into maint-0.2.4
| -rw-r--r-- | changes/bug8719 | 6 | ||||
| -rw-r--r-- | src/or/networkstatus.c | 5 |
2 files changed, 9 insertions, 2 deletions
diff --git a/changes/bug8719 b/changes/bug8719 new file mode 100644 index 0000000000..c05b79ddec --- /dev/null +++ b/changes/bug8719 @@ -0,0 +1,6 @@ + o Major bugfixes (memory leak): + - Avoid a memory leak where we would leak a consensus body when we find + that a consensus which we couldn't previously verify due to missing + certificates is now verifiable. Fixes bug 8719; bugfix on + 0.2.0.10-alpha. + diff --git a/src/or/networkstatus.c b/src/or/networkstatus.c index f5428f165d..8715841544 100644 --- a/src/or/networkstatus.c +++ b/src/or/networkstatus.c @@ -1878,11 +1878,12 @@ networkstatus_note_certs_arrived(void) if (!waiting->consensus) continue; if (networkstatus_check_consensus_signature(waiting->consensus, 0)>=0) { + char *waiting_body = waiting->body; if (!networkstatus_set_current_consensus( - waiting->body, + waiting_body, networkstatus_get_flavor_name(i), NSSET_WAS_WAITING_FOR_CERTS)) { - tor_free(waiting->body); + tor_free(waiting_body); } } } |