summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorNick Mathewson <nickm@torproject.org>2016-05-20 10:46:45 -0400
committerNick Mathewson <nickm@torproject.org>2016-05-20 10:46:45 -0400
commitfd34049f3d565e906d4c1e9b73332f61ebfe7673 (patch)
tree57c63f99373b171299d4be18432add56417bbedd
parentf2824887e326e9fdc5f096f99d4dfe4aeee4d79a (diff)
parent50cbf220994c7cec5939666cbf990acb4aaa46c6 (diff)
downloadtor-fd34049f3d565e906d4c1e9b73332f61ebfe7673.tar.gz
tor-fd34049f3d565e906d4c1e9b73332f61ebfe7673.zip
Merge branch 'maint-0.2.8' into release-0.2.8
-rw-r--r--src/or/routerlist.c2
1 files changed, 2 insertions, 0 deletions
diff --git a/src/or/routerlist.c b/src/or/routerlist.c
index f9247cba08..d49814f056 100644
--- a/src/or/routerlist.c
+++ b/src/or/routerlist.c
@@ -2932,6 +2932,7 @@ signed_descriptor_free(signed_descriptor_t *sd)
return;
tor_free(sd->signed_descriptor_body);
+ tor_cert_free(sd->signing_key_cert);
memset(sd, 99, sizeof(signed_descriptor_t)); /* Debug bad mem usage */
tor_free(sd);
@@ -2949,6 +2950,7 @@ signed_descriptor_from_routerinfo(routerinfo_t *ri)
memcpy(sd, &(ri->cache_info), sizeof(signed_descriptor_t));
sd->routerlist_index = -1;
ri->cache_info.signed_descriptor_body = NULL;
+ ri->cache_info.signing_key_cert = NULL;
routerinfo_free(ri);
return sd;
}