commit 2845607f9706dc00aa799fc609d692e8d8c4786f Author: rl1987 rl1987@sdf.lonestar.org Date: Fri May 17 19:44:45 2019 +0300

In microdesc_cache_reload(), set journal length to length of string we read

Hopefully this will fix CID 1444769. --- src/feature/nodelist/microdesc.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/src/feature/nodelist/microdesc.c b/src/feature/nodelist/microdesc.c index db2149754..89ac0a2f8 100644 --- a/src/feature/nodelist/microdesc.c +++ b/src/feature/nodelist/microdesc.c @@ -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,