]> git.ipfire.org Git - thirdparty/tor.git/commitdiff
In microdesc_cache_reload(), set journal length to length of string we read
authorrl1987 <rl1987@sdf.lonestar.org>
Fri, 17 May 2019 16:44:45 +0000 (19:44 +0300)
committerNick Mathewson <nickm@torproject.org>
Mon, 20 May 2019 13:08:10 +0000 (09:08 -0400)
Hopefully this will fix CID 1444769.

src/feature/nodelist/microdesc.c

index db2149754af7b551a3d596d69a22157ebc1f2b27..89ac0a2f839a25ca3c3800cbbd21e516cd73bf44 100644 (file)
@@ -536,8 +536,8 @@ 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;
-    warn_if_nul_found(journal_content, cache->journal_len, 0,
+    cache->journal_len = strlen(journal_content);
+    warn_if_nul_found(journal_content, (size_t)st.st_size, 0,
                       "reading microdesc journal");
     added = microdescs_add_to_cache(cache, journal_content,
                                     journal_content+st.st_size,