diff options
| author | Nick Mathewson <nickm@torproject.org> | 2013-11-22 12:27:41 -0500 |
|---|---|---|
| committer | Nick Mathewson <nickm@torproject.org> | 2013-11-22 12:27:41 -0500 |
| commit | 569dbcc615959fc48aae5736f5ec89a2bd336488 (patch) | |
| tree | c4ecc5e4c70067a11ad6e5790e6b7734b844d66e /src/test/test.c | |
| parent | 7c76fd5a8289ffa38507a67c6323f6e7d9ef732b (diff) | |
| download | tor-569dbcc615959fc48aae5736f5ec89a2bd336488.tar tor-569dbcc615959fc48aae5736f5ec89a2bd336488.tar.gz | |
Fix another unit test memory leak. CID1087949,CID1087950.
Diffstat (limited to 'src/test/test.c')
| -rw-r--r-- | src/test/test.c | 12 |
1 files changed, 7 insertions, 5 deletions
diff --git a/src/test/test.c b/src/test/test.c index 752f8d712..6ea41b140 100644 --- a/src/test/test.c +++ b/src/test/test.c @@ -31,6 +31,7 @@ const char tor_git_revision[] = ""; #define GEOIP_PRIVATE #define ROUTER_PRIVATE #define CIRCUITSTATS_PRIVATE +#define CIRCUITLIST_PRIVATE /* * Linux doesn't provide lround in math.h by default, but mac os does... @@ -426,10 +427,12 @@ test_onion_queues(void) test_eq(0, onion_num_pending(ONION_HANDSHAKE_TYPE_TAP)); test_eq(0, onion_pending_add(circ1, create1)); + create1 = NULL; test_eq(1, onion_num_pending(ONION_HANDSHAKE_TYPE_TAP)); test_eq(0, onion_num_pending(ONION_HANDSHAKE_TYPE_NTOR)); test_eq(0, onion_pending_add(circ2, create2)); + create2 = NULL; test_eq(1, onion_num_pending(ONION_HANDSHAKE_TYPE_NTOR)); test_eq_ptr(circ2, onion_next_task(&onionskin)); @@ -441,11 +444,10 @@ test_onion_queues(void) test_eq(0, onion_num_pending(ONION_HANDSHAKE_TYPE_NTOR)); done: - ; -// circuit_free(circ1); -// circuit_free(circ2); - /* and free create1 and create2 */ - /* XXX leaks everything here */ + circuit_free(TO_CIRCUIT(circ1)); + circuit_free(TO_CIRCUIT(circ2)); + tor_free(create1); + tor_free(create2); } static void |