From 7ff18cc1b64e4a119ec3b46102c897f3ca7107f8 Mon Sep 17 00:00:00 2001 From: "teor (Tim Wilson-Brown)" Date: Tue, 1 Dec 2015 10:50:14 +1100 Subject: Avoid relying on malloc internals in test_rend_cache_purge. Closes ticket 17724. Bug fix on ade5005853c1 and 5e9f2384cf0f, not in any released version of Tor. Patch by "teor". --- src/test/test_rendcache.c | 8 +++----- 1 file changed, 3 insertions(+), 5 deletions(-) (limited to 'src/test') diff --git a/src/test/test_rendcache.c b/src/test/test_rendcache.c index 11f11147cb..92adf01273 100644 --- a/src/test/test_rendcache.c +++ b/src/test/test_rendcache.c @@ -1024,24 +1024,22 @@ test_rend_cache_entry_free(void *data) static void test_rend_cache_purge(void *data) { - strmap_t *our_rend_cache; - (void)data; // Deals with a NULL rend_cache rend_cache_purge(); tt_assert(rend_cache); - tt_int_op(strmap_size(rend_cache), OP_EQ, 0); + tt_assert(strmap_size(rend_cache) == 0); // Deals with existing rend_cache rend_cache_free_all(); rend_cache_init(); + tt_assert(rend_cache); + tt_assert(strmap_size(rend_cache) == 0); - our_rend_cache = rend_cache; rend_cache_purge(); tt_assert(rend_cache); tt_assert(strmap_size(rend_cache) == 0); - tt_assert(rend_cache == our_rend_cache); done: rend_cache_free_all(); -- cgit v1.2.3-54-g00ecf