tor

commit a47b8fcf9295111339b80e5bc81c3de428241cad
parent 5368eaf62b2b4804e75fc301757f843d64ef941d
Author: Nick Mathewson <nickm@torproject.org>
Date:   Tue,  8 Aug 2017 19:29:05 -0400

Merge branch 'bug23139' into maint-0.3.1

Diffstat:
A
changes/bug23139
 | 
3
+++
M
src/or/consdiffmgr.c
 | 
1
+

2 files changed, 4 insertions(+), 0 deletions(-)
diff --git a/changes/bug23139 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
@@ -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))