sarah
/
tor
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Merge branch 'bug9644_024' into maint-0.2.4

This commit is contained in:
Nick Mathewson 2013-10-10 11:23:46 -04:00
parent 7b1b8c3694 7dbf66713f
commit 2c7ed0406f
2 changed files with 26 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
changes/bug9644 Normal file
View File

@ -0,0 +1,4 @@
o Minor bugfixes:
- Fix a small memory leak on exit. (We weren't freeing directory
authority certificate download statuses.) Fixes bug 9644; bugfix
on 0.2.4.13-alpha.

29
src/or/routerlist.c
View File

@ -241,6 +241,27 @@ get_cert_list(const char *id_digest)
return cl;
}
/** Release all space held by a cert_list_t */
static void
cert_list_free(cert_list_t *cl)
{
if (!cl)
return;
SMARTLIST_FOREACH(cl->certs, authority_cert_t *, cert,
authority_cert_free(cert));
smartlist_free(cl->certs);
dsmap_free(cl->dl_status_map, tor_free_);
tor_free(cl);
}
/** Wrapper for cert_list_free so we can pass it to digestmap_free */
static void
cert_list_free_(void *cl)
{
cert_list_free(cl);
}
/** Reload the cached v3 key certificates from the cached-certs file in
* the data directory. Return 0 on success, -1 on failure. */
int
@ -3324,13 +3345,7 @@ routerlist_free_all(void)
smartlist_free(fallback_dir_servers);
trusted_dir_servers = fallback_dir_servers = NULL;
if (trusted_dir_certs) {
DIGESTMAP_FOREACH(trusted_dir_certs, key, cert_list_t *, cl) {
SMARTLIST_FOREACH(cl->certs, authority_cert_t *, cert,
authority_cert_free(cert));
smartlist_free(cl->certs);
tor_free(cl);
} DIGESTMAP_FOREACH_END;
digestmap_free(trusted_dir_certs, NULL);
digestmap_free(trusted_dir_certs, cert_list_free_);
trusted_dir_certs = NULL;
}
}