From 1115366e95388de70996b5aafda17363db2a44fd Mon Sep 17 00:00:00 2001
From: Nick Mathewson <nickm@torproject.org>
Date: Tue, 7 Sep 2010 10:28:15 -0400
Subject: [PATCH] Fix a few memory leaks in the tests

---
 test/regress.c      | 2 ++
 test/regress_et.c   | 4 +++-
 test/regress_util.c | 5 ++++-
 test/test-ratelim.c | 4 ++++
 4 files changed, 13 insertions(+), 2 deletions(-)

diff --git a/test/regress.c b/test/regress.c
index 8ce68e77..230787ac 100644
--- a/test/regress.c
+++ b/test/regress.c
@@ -470,6 +470,8 @@ end:
 		evutil_closesocket(pair2[1]);
 	if (rev)
 		event_free(rev);
+	if (wev)
+		event_free(wev);
 	if (closeev)
 		event_free(closeev);
 	if (base)
diff --git a/test/regress_et.c b/test/regress_et.c
index 0cba7564..94123499 100644
--- a/test/regress_et.c
+++ b/test/regress_et.c
@@ -153,7 +153,7 @@ static void
 test_edgetriggered_mix_error(void *data_)
 {
 	struct basic_test_data *data = data_;
-	struct event_base *base;
+	struct event_base *base = NULL;
 	struct event *ev_et=NULL, *ev_lt=NULL;
 
 #ifdef _EVENT_DISABLE_DEBUG_MODE
@@ -187,6 +187,8 @@ end:
 		event_free(ev_et);
 	if (ev_lt)
 		event_free(ev_lt);
+	if (base)
+		event_base_free(base);
 }
 
 struct testcase_t edgetriggered_testcases[] = {
diff --git a/test/regress_util.c b/test/regress_util.c
index 8b53c9fd..9babc0a9 100644
--- a/test/regress_util.c
+++ b/test/regress_util.c
@@ -421,8 +421,11 @@ logfn(int severity, const char *msg)
 {
 	logsev = severity;
 	tt_want(msg);
-	if (msg)
+	if (msg) {
+		if (logmsg)
+			free(logmsg);
 		logmsg = strdup(msg);
+	}
 }
 
 static int fatal_want_severity = 0;
diff --git a/test/test-ratelim.c b/test/test-ratelim.c
index 306f1254..1f280e9d 100644
--- a/test/test-ratelim.c
+++ b/test/test-ratelim.c
@@ -323,6 +323,10 @@ test_ratelimiting(void)
 		ok = 0;
 	}
 
+	event_base_free(base);
+	free(bevs);
+	free(states);
+
 	return ok ? 0 : 1;
 }