diff options
| author | Nick Mathewson <nickm@torproject.org> | 2014-04-26 00:10:04 -0400 |
|---|---|---|
| committer | Nick Mathewson <nickm@torproject.org> | 2014-04-26 00:10:04 -0400 |
| commit | c7951731ed1bcc06d1eb404bd699cc0e0392e626 (patch) | |
| tree | 9622bfee17298b716e3ea7dc3a9c1fa093704d5f /src/test | |
| parent | d2147cc7ba5c5d5114bae61000cbf757353c3ed6 (diff) | |
| download | tor-c7951731ed1bcc06d1eb404bd699cc0e0392e626.tar tor-c7951731ed1bcc06d1eb404bd699cc0e0392e626.tar.gz | |
Fix memory leaks in test_circuit_timeout
Found with valgrind.
Diffstat (limited to 'src/test')
| -rw-r--r-- | src/test/test.c | 16 |
1 files changed, 11 insertions, 5 deletions
diff --git a/src/test/test.c b/src/test/test.c index 771725e23..f1486e94c 100644 --- a/src/test/test.c +++ b/src/test/test.c @@ -32,6 +32,7 @@ const char tor_git_revision[] = ""; #define ROUTER_PRIVATE #define CIRCUITSTATS_PRIVATE #define CIRCUITLIST_PRIVATE +#define STATEFILE_PRIVATE /* * Linux doesn't provide lround in math.h by default, but mac os does... @@ -59,6 +60,7 @@ double fabs(double x); #include "policies.h" #include "rephist.h" #include "routerparse.h" +#include "statefile.h" #ifdef CURVE25519_ENABLED #include "crypto_curve25519.h" #include "onion_ntor.h" @@ -466,14 +468,14 @@ test_circuit_timeout(void) circuit_build_times_t estimate; circuit_build_times_t final; double timeout1, timeout2; - or_state_t state; + or_state_t *state=NULL; int i, runs; double close_ms; circuit_build_times_init(&initial); circuit_build_times_init(&estimate); circuit_build_times_init(&final); - memset(&state, 0, sizeof(or_state_t)); + state = or_state_new(); circuitbuild_running_unit_tests(); #define timeout0 (build_time_t)(30*1000.0) @@ -505,8 +507,9 @@ test_circuit_timeout(void) test_assert(estimate.total_build_times <= CBT_NCIRCUITS_TO_OBSERVE); - circuit_build_times_update_state(&estimate, &state); - test_assert(circuit_build_times_parse_state(&final, &state) == 0); + circuit_build_times_update_state(&estimate, state); + circuit_build_times_free_timeouts(&final); + test_assert(circuit_build_times_parse_state(&final, state) == 0); circuit_build_times_update_alpha(&final); timeout2 = circuit_build_times_calculate_timeout(&final, @@ -595,7 +598,10 @@ test_circuit_timeout(void) } done: - return; + circuit_build_times_free_timeouts(&initial); + circuit_build_times_free_timeouts(&estimate); + circuit_build_times_free_timeouts(&final); + or_state_free(state); } /** Test encoding and parsing of rendezvous service descriptors. */ |