summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorNick Mathewson <nickm@torproject.org>2018-01-24 12:07:45 -0500
committerNick Mathewson <nickm@torproject.org>2018-01-24 12:07:45 -0500
commit6ba2881aec7299fb486ab0f821c4f2ddcc88190e (patch)
treecc6310058b1cff94974a925bf501e48812eba9f5
parent129456e22257d24c380bed0f9ebc9d68955a01df (diff)
downloadtor-6ba2881aec7299fb486ab0f821c4f2ddcc88190e.tar.gz
tor-6ba2881aec7299fb486ab0f821c4f2ddcc88190e.zip
Fix a memory leak in scheduler/loop_kist
Fixes bug 25005.
-rw-r--r--changes/bug250054
-rw-r--r--src/test/test_scheduler.c1
2 files changed, 5 insertions, 0 deletions
diff --git a/changes/bug25005 b/changes/bug25005
new file mode 100644
index 0000000000..dedf283aa9
--- /dev/null
+++ b/changes/bug25005
@@ -0,0 +1,4 @@
+ o Minor bugfixes (unit tests):
+ - Fix a memory leak in the scheduler/loop_kist unit test. Fixes bug
+ 25005; bugfix on 0.3.2.7-rc.
+
diff --git a/src/test/test_scheduler.c b/src/test/test_scheduler.c
index 63add2f382..18f9895146 100644
--- a/src/test/test_scheduler.c
+++ b/src/test/test_scheduler.c
@@ -864,6 +864,7 @@ test_scheduler_loop_kist(void *arg)
tt_assert(ch3);
ch3->magic = TLS_CHAN_MAGIC;
ch3->state = CHANNEL_STATE_OPEN;
+ circuitmux_free(ch3->cmux);
ch3->cmux = circuitmux_alloc();
channel_register(ch3);
tt_assert(ch3->registered);