aboutsummaryrefslogtreecommitdiff
path: root/src/or/control.c
diff options
context:
space:
mode:
authorNick Mathewson <nickm@torproject.org>2008-01-30 23:46:02 +0000
committerNick Mathewson <nickm@torproject.org>2008-01-30 23:46:02 +0000
commit76ca012a3b767e66a7dcaae417cbb98628d9e512 (patch)
tree04b31aa979742b8d25a270edd21acac2d55c4d58 /src/or/control.c
parent2a9ba2e257cd90905c99d30458d11f3c012181ed (diff)
downloadtor-76ca012a3b767e66a7dcaae417cbb98628d9e512.tar.gz
tor-76ca012a3b767e66a7dcaae417cbb98628d9e512.zip
r17856@catbus: nickm | 2008-01-30 18:45:36 -0500
Backport leak fixes from r13148. svn:r13343
Diffstat (limited to 'src/or/control.c')
-rw-r--r--src/or/control.c2
1 files changed, 2 insertions, 0 deletions
diff --git a/src/or/control.c b/src/or/control.c
index 2e3f771abb..459b3f40c8 100644
--- a/src/or/control.c
+++ b/src/or/control.c
@@ -668,6 +668,7 @@ control_setconf_helper(control_connection_t *conn, uint32_t len, char *body,
connection_write_str_to_buf("551 Couldn't parse string\r\n", conn);
SMARTLIST_FOREACH(entries, char *, cp, tor_free(cp));
smartlist_free(entries);
+ tor_free(key);
return 0;
}
}
@@ -1276,6 +1277,7 @@ getinfo_helper_dir(control_connection_t *control_conn,
res = dirserv_get_routerdescs(descs, url, &msg);
if (res) {
log_warn(LD_CONTROL, "getinfo '%s': %s", question, msg);
+ smartlist_free(descs);
return -1;
}
SMARTLIST_FOREACH(descs, signed_descriptor_t *, sd,