summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorNick Mathewson <nickm@torproject.org>2017-08-08 09:12:09 -0400
committerNick Mathewson <nickm@torproject.org>2017-08-08 09:13:45 -0400
commit3af4aafbcb035271f84480ef745bad2b8c28a92b (patch)
tree2bb5e4c2892808e0e5c456f432b61a7ded1aee80
parent1168e21b45cb981463fa77a45c2e697bb75d573c (diff)
downloadtor-3af4aafbcb035271f84480ef745bad2b8c28a92b.tar.gz
tor-3af4aafbcb035271f84480ef745bad2b8c28a92b.zip
Fix a memory leak in consdiffmgr.c
Fixes bug 23139; bugfix on 0.3.1.1-alpha.
-rw-r--r--changes/bug231393
-rw-r--r--src/or/consdiffmgr.c1
2 files changed, 4 insertions, 0 deletions
diff --git a/changes/bug23139 b/changes/bug23139
new file mode 100644
index 0000000000..ed63ce85e2
--- /dev/null
+++ b/changes/bug23139
@@ -0,0 +1,3 @@
+ o Minor bugfixes (directory cache):
+ - Fix a memory leak in the code that recovers space in the consensus
+ directory cache. Fixes bug 23139; bugfix on 0.3.1.1-alpha.
diff --git a/src/or/consdiffmgr.c b/src/or/consdiffmgr.c
index 67a5d0b3c5..928fc26f54 100644
--- a/src/or/consdiffmgr.c
+++ b/src/or/consdiffmgr.c
@@ -1156,6 +1156,7 @@ consdiffmgr_ensure_space_for_files(int n)
if (++n_marked >= n_to_remove)
break;
} SMARTLIST_FOREACH_END(ent);
+ smartlist_free(objects);
consensus_cache_delete_pending(cache, 1);
if (BUG(n_marked < n_to_remove))