From 615d19fe4c34a0c270e16268eff135fb9e976eb1 Mon Sep 17 00:00:00 2001 From: Nick Mathewson Date: Mon, 10 Sep 2007 13:48:01 +0000 Subject: [PATCH] r15001@catbus: nickm | 2007-09-10 09:44:49 -0400 Fix a couple of memory leaks in eventdns.c; found by niels. Not backport candidates, since they only affect DNSPort users. svn:r11413 --- ChangeLog | 2 ++ src/or/eventdns.c | 3 ++- 2 files changed, 4 insertions(+), 1 deletion(-) diff --git a/ChangeLog b/ChangeLog index 4e7af1f584..ec07b237fc 100644 --- a/ChangeLog +++ b/ChangeLog @@ -27,6 +27,8 @@ Changes in version 0.2.0.7-alpha - 2007-??-?? "experimental", since it seems to have worked fine for ages. - Fix a user-triggerable segfault in expand_filename(). (There isn't a way to trigger this remotely.) + - Fix a memory leak when freeing incomplete requests from DNSPort. + (Found by Niels Provos with valgrind.) o Code simplifications and refactoring: - Revamp file-writing logic so we don't need to have the entire contents diff --git a/src/or/eventdns.c b/src/or/eventdns.c index 5074bcd541..5f2ae9d96f 100644 --- a/src/or/eventdns.c +++ b/src/or/eventdns.c @@ -1745,7 +1745,7 @@ server_request_free_answers(struct server_request *req) free(victim->name); if (victim->data) free(victim->data); - /* XXXX free(victim?) -NM */ + free(victim); victim = next; } *list = NULL; @@ -1761,6 +1761,7 @@ server_request_free(struct server_request *req) if (req->base.questions) { for (i = 0; i < req->base.nquestions; ++i) free(req->base.questions[i]); + free(req->base.questions); } if (req->port) {