diff options
| author | Nick Mathewson <nickm@torproject.org> | 2018-01-24 12:09:07 -0500 |
|---|---|---|
| committer | Nick Mathewson <nickm@torproject.org> | 2018-01-24 12:09:07 -0500 |
| commit | fd8ee1d7c335a02a6fd29cd1a826037efe28e100 (patch) | |
| tree | f6a6a9cf9790c5fd845ee767f7934b967c54d99f | |
| parent | 2484d1eb35d9a54d0e417466148c8480a4816ab7 (diff) | |
| parent | 6ba2881aec7299fb486ab0f821c4f2ddcc88190e (diff) | |
| download | tor-fd8ee1d7c335a02a6fd29cd1a826037efe28e100.tar.gz tor-fd8ee1d7c335a02a6fd29cd1a826037efe28e100.zip | |
Merge branch 'maint-0.3.2'
| -rw-r--r-- | changes/bug25005 | 4 | ||||
| -rw-r--r-- | src/test/test_scheduler.c | 1 |
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 0d8a9eaa1f..cb5c245cea 100644 --- a/src/test/test_scheduler.c +++ b/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); |