From aec4aea19045fa9fe1c80bd032bb97ad06bbf44e Mon Sep 17 00:00:00 2001 From: Nick Mathewson Date: Sat, 23 Jan 2010 20:46:38 -0500 Subject: Fix two rare leaks spotted by rieo. --- src/or/router.c | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/src/or/router.c b/src/or/router.c index dab4cb893..97f411dcd 100644 --- a/src/or/router.c +++ b/src/or/router.c @@ -1384,6 +1384,7 @@ router_rebuild_descriptor(int force) if (extrainfo_dump_to_string(ei->cache_info.signed_descriptor_body, 8192, ei, get_identity_key()) < 0) { log_warn(LD_BUG, "Couldn't generate extra-info descriptor."); + routerinfo_free(ri); extrainfo_free(ei); return -1; } @@ -1400,6 +1401,8 @@ router_rebuild_descriptor(int force) if (router_dump_router_to_string(ri->cache_info.signed_descriptor_body, 8192, ri, get_identity_key())<0) { log_warn(LD_BUG, "Couldn't generate router descriptor."); + routerinfo_free(ri); + extrainfo_free(ei); return -1; } ri->cache_info.signed_descriptor_len = @@ -1885,6 +1888,7 @@ extrainfo_dump_to_string(char *s, size_t maxlen, extrainfo_t *extrainfo, log_err(LD_BUG, "We just generated an extrainfo descriptor we can't parse."); log_err(LD_BUG, "Descriptor was: <<%s>>", s); + tor_free(s_dup); return -1; } tor_free(s_dup); -- cgit v1.2.3