[tor-commits] [tor/maint-0.2.2] Add missing code to set cache->journal_len when reading microdesc journal

[nickm at torproject.org]

commit 698fa0fc67118bea2ea7720455ebbdee705c8c1a
Author: Nick Mathewson <nickm at torproject.org>
Date:   Tue May 3 16:22:31 2011 -0400

    Add missing code to set cache->journal_len when reading microdesc journal
    
    This could be one reason that authorities' journals would grow without
    bound; related to bug 2230. Bugfix on 0.2.2.6-alpha.  Fix by
    "cypherpunks".
---
 changes/bug2230_part1 |    7 +++++++
 src/or/microdesc.c    |    1 +
 2 files changed, 8 insertions(+), 0 deletions(-)

diff --git a/changes/bug2230_part1 b/changes/bug2230_part1
new file mode 100644
index 0000000..79f7254
--- /dev/null
+++ b/changes/bug2230_part1
@@ -0,0 +1,7 @@
+  o Minor bugfixes
+    - When loading the microdesc journal, remember its current size.
+      In 0.2.2, this helps prevent the microdesc journal from growing
+      without limit on authorities (who are the only ones to use it in
+      0.2.2).  Fixes a part of bug 2230; bugfix on 0.2.2.6-alpha.
+      Fix posted by "cypherpunks."
+      
diff --git a/src/or/microdesc.c b/src/or/microdesc.c
index 2c4b343..3566277 100644
--- a/src/or/microdesc.c
+++ b/src/or/microdesc.c
@@ -261,6 +261,7 @@ microdesc_cache_reload(microdesc_cache_t *cache)
   journal_content = read_file_to_str(cache->journal_fname,
                                      RFTS_IGNORE_MISSING, &st);
   if (journal_content) {
+    cache->journal_len = (size_t) st.st_size;
     added = microdescs_add_to_cache(cache, journal_content,
                                     journal_content+st.st_size,
                                     SAVED_IN_JOURNAL, 0);