summaryrefslogtreecommitdiff
path: root/src/test/test_circuitlist.c
diff options
context:
space:
mode:
authorNick Mathewson <nickm@torproject.org>2014-09-02 15:40:47 -0400
committerNick Mathewson <nickm@torproject.org>2014-09-02 15:40:47 -0400
commitbce32e0a356bc9d0b95a34301c6f3cc54622c4bb (patch)
tree074ef96559bcacd7fa2f12e2cfd82657b7820b5d /src/test/test_circuitlist.c
parenta14c6cb70f56c24cc76023366f8ae56900f72296 (diff)
downloadtor-bce32e0a356bc9d0b95a34301c6f3cc54622c4bb.tar.gz
tor-bce32e0a356bc9d0b95a34301c6f3cc54622c4bb.zip
Fix more (void*)11 warnings in the tests
Diffstat (limited to 'src/test/test_circuitlist.c')
-rw-r--r--src/test/test_circuitlist.c12
1 files changed, 9 insertions, 3 deletions
diff --git a/src/test/test_circuitlist.c b/src/test/test_circuitlist.c
index b19edd1fd4..97c6b98ac3 100644
--- a/src/test/test_circuitlist.c
+++ b/src/test/test_circuitlist.c
@@ -79,9 +79,9 @@ test_clist_maps(void *arg)
memset(&cam, 0, sizeof(cam));
memset(&cdm, 0, sizeof(cdm));
- ch1->cmux = (void*)0x1001;
- ch2->cmux = (void*)0x1002;
- ch3->cmux = (void*)0x1003;
+ ch1->cmux = tor_malloc(1);
+ ch2->cmux = tor_malloc(1);
+ ch3->cmux = tor_malloc(1);
or_c1 = or_circuit_new(100, ch2);
tt_assert(or_c1);
@@ -156,6 +156,12 @@ test_clist_maps(void *arg)
circuit_free(TO_CIRCUIT(or_c1));
if (or_c2)
circuit_free(TO_CIRCUIT(or_c2));
+ if (ch1)
+ tor_free(ch1->cmux);
+ if (ch2)
+ tor_free(ch2->cmux);
+ if (ch3)
+ tor_free(ch3->cmux);
tor_free(ch1);
tor_free(ch2);
tor_free(ch3);