aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorNick Mathewson <nickm@torproject.org>2016-05-20 10:46:50 -0400
committerNick Mathewson <nickm@torproject.org>2016-05-20 10:46:50 -0400
commit9c7edb0f3edd2dec30f10e195f7bcc12a4005f30 (patch)
tree0ebdd86aaaa749fb7db96f94cf722c3c92495fbe
parent33ffeab69417d2dbc017efeb4a393fa0f516669d (diff)
parent50cbf220994c7cec5939666cbf990acb4aaa46c6 (diff)
downloadtor-9c7edb0f3edd2dec30f10e195f7bcc12a4005f30.tar.gz
tor-9c7edb0f3edd2dec30f10e195f7bcc12a4005f30.zip
Merge branch 'maint-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 98e505653d..dd16e4b06b 100644
--- a/src/or/routerlist.c
+++ b/src/or/routerlist.c
@@ -2988,6 +2988,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);
@@ -3005,6 +3006,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;
}