Commit 5cc155e0 authored by Nick Mathewson's avatar Nick Mathewson 🦀
Browse files

Merge remote-tracking branch 'public/bug9645' into maint-0.2.4

parents db2c2a69 264aa271

changes/bug9645a

0 → 100644
+5 −0
Original line number Diff line number Diff line 
  o Minor bugfixes:

    - If we are unable to save a microdescriptor to the journal, do not

      drop it from memory and then reattempt downloading it. Fixes bug

      9645; bugfix on 0.2.2.6-alpha.

src/or/microdesc.c

+4 −5
Original line number Diff line number Diff line
@@ -213,7 +213,6 @@ microdescs_add_list_to_cache(microdesc_cache_t *cache, 
    if (fd < 0) {

      log_warn(LD_DIR, "Couldn't append to journal in %s: %s",

               cache->journal_fname, strerror(errno));

      return NULL;

    }

  }
@@ -238,11 +237,11 @@ microdescs_add_list_to_cache(microdesc_cache_t *cache, 
      if (size < 0) {

        /* we already warned in dump_microdescriptor */

        abort_writing_to_file(open_file);

        smartlist_clear(added);

        return added;

      }

        fd = -1;

      } else {

        md->saved_location = SAVED_IN_JOURNAL;

        cache->journal_len += size;

      }

    } else {

      md->saved_location = where;

    }