aboutsummaryrefslogtreecommitdiff
path: root/src/or/routerparse.h
diff options
context:
space:
mode:
authorNick Mathewson <nickm@torproject.org>2013-12-16 13:00:15 -0500
committerNick Mathewson <nickm@torproject.org>2013-12-16 13:06:00 -0500
commitd8cfa2ef4e6d57f6dd4a33e5b3cfb1a2a12fc4be (patch)
tree995f347a060a3d7abadbc2f69daeddb4c1e174bc /src/or/routerparse.h
parent9e907076025ccd91abfad7fc70c09ba4c9228f82 (diff)
downloadtor-d8cfa2ef4e6d57f6dd4a33e5b3cfb1a2a12fc4be.tar.gz
tor-d8cfa2ef4e6d57f6dd4a33e5b3cfb1a2a12fc4be.zip
Avoid free()ing from an mmap on corrupted microdesc cache
The 'body' field of a microdesc_t holds a strdup()'d value if the microdesc's saved_location field is SAVED_IN_JOURNAL or SAVED_NOWHERE, and holds a pointer to the middle of an mmap if the microdesc is SAVED_IN_CACHE. But we weren't setting that field until a while after we parsed the microdescriptor, which left an interval where microdesc_free() would try to free() the middle of the mmap(). This patch also includes a regression test. This is a fix for #10409; bugfix on 0.2.2.6-alpha.
Diffstat (limited to 'src/or/routerparse.h')
-rw-r--r--src/or/routerparse.h2
1 files changed, 1 insertions, 1 deletions
diff --git a/src/or/routerparse.h b/src/or/routerparse.h
index c6382a7f6b..e357f18b85 100644
--- a/src/or/routerparse.h
+++ b/src/or/routerparse.h
@@ -64,7 +64,7 @@ ns_detached_signatures_t *networkstatus_parse_detached_signatures(
smartlist_t *microdescs_parse_from_string(const char *s, const char *eos,
int allow_annotations,
- int copy_body);
+ saved_location_t where);
authority_cert_t *authority_cert_parse_from_string(const char *s,
const char **end_of_string);