commit 0a6beb936866447742d1117eefcfeef2e62326fc Author: Nick Mathewson nickm@torproject.org Date: Thu Feb 24 09:47:33 2011 -0500

Fix memory leak in md-download logic

Also fix some microdesc comments

Fix for bug 2623 --- src/or/directory.c | 1 + src/or/microdesc.c | 4 ++-- 2 files changed, 3 insertions(+), 2 deletions(-)

diff --git a/src/or/directory.c b/src/or/directory.c index 7137fe1..e4752b8 100644 --- a/src/or/directory.c +++ b/src/or/directory.c @@ -1957,6 +1957,7 @@ connection_dir_client_reached_eof(dir_connection_t *conn) } SMARTLIST_FOREACH(which, char *, cp, tor_free(cp)); smartlist_free(which); + smartlist_free(mds); } }

diff --git a/src/or/microdesc.c b/src/or/microdesc.c index 2480b8e..469c2fc 100644 --- a/src/or/microdesc.c +++ b/src/or/microdesc.c @@ -133,7 +133,7 @@ get_microdesc_cache(void) * to allow, so we should reject any non-requested microdesc with a different * digest, and alter the list to contain only the digests of those microdescs * we didn't find. - * Return a list of the added microdescriptors. */ + * Return a newly allocated list of the added microdescriptors, or NULL */ smartlist_t * microdescs_add_to_cache(microdesc_cache_t *cache, const char *s, const char *eos, saved_location_t where, @@ -181,7 +181,7 @@ microdescs_add_to_cache(microdesc_cache_t *cache, }

/* As microdescs_add_to_cache, but takes a list of micrdescriptors instead of - * a string to encode. Frees any members of <b>descriptors</b> that it does + * a string to decode. Frees any members of <b>descriptors</b> that it does * not add. */ smartlist_t * microdescs_add_list_to_cache(microdesc_cache_t *cache,