Browse Source

Merge branch 'maint-0.3.2'

Nick Mathewson 6 years ago
parent
commit
fd8ee1d7c3
2 changed files with 5 additions and 0 deletions
  1. 4 0
      changes/bug25005
  2. 1 0
      src/test/test_scheduler.c

+ 4 - 0
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.
+

+ 1 - 0
src/test/test_scheduler.c

@@ -852,6 +852,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);