Commit 698fa0fc authored by Nick Mathewson's avatar Nick Mathewson 🐘
Browse files

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".
parent 033c27ac

changes/bug2230_part1

0 → 100644
+7 −0
Changes for changes/bug2230_part1: 7 added lines, 0 removed lines.
Original line number Original line Diff line number Diff line 
  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."

src/or/microdesc.c

+1 −0
Changes for src/or/microdesc.c: 1 added line, 0 removed lines.
Original line number Original line Diff line number Diff line
@@ -261,6 +261,7 @@ microdesc_cache_reload(microdesc_cache_t *cache) 
  journal_content = read_file_to_str(cache->journal_fname,

  journal_content = read_file_to_str(cache->journal_fname,

                                     RFTS_IGNORE_MISSING, &st);

                                     RFTS_IGNORE_MISSING, &st);

  if (journal_content) {

  if (journal_content) {

    cache->journal_len = (size_t) st.st_size;

    added = microdescs_add_to_cache(cache, journal_content,

    added = microdescs_add_to_cache(cache, journal_content,

                                    journal_content+st.st_size,

                                    journal_content+st.st_size,

                                    SAVED_IN_JOURNAL, 0);

                                    SAVED_IN_JOURNAL, 0);