mirrors/tor
1
0
Fork 0
mirror of https://gitlab.torproject.org/tpo/core/tor.git synced 2025-02-24 22:58:50 +01:00
Code Issues Projects Releases Wiki Activity

Fix the leaks that valgrind found in the new routerset tests.

Browse source 
(We have a tests-shouldn't-leak policy so that we won't accidentally
ignore true-positives.)
This commit is contained in:
Nick Mathewson 2014-09-03 09:51:14 -04:00
parent d19cbf3ab1
commit 0e66edb254
1 changed files with 14 additions and 14 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

28
src/test/test_routerset.c
View file

@ -1487,8 +1487,9 @@ NS(test_main)(void *arg)
/* Just recreate list, so we can simply use routerset_free. */ /* Just recreate list, so we can simply use routerset_free. */
set->list = smartlist_new(); set->list = smartlist_new();
done: done:
routerset_free(set); routerset_free(set);
smartlist_free(out);
} }
#undef NS_SUBMODULE #undef NS_SUBMODULE
@ -1810,8 +1811,8 @@ NS(test_main)(void *arg)
static void static void
NS(test_main)(void *arg) NS(test_main)(void *arg)
{ {
const routerset_t *set; routerset_t *set = NULL;
char *s; char *s = NULL;
(void)arg; (void)arg;
set = NULL; set = NULL;
@ -1823,12 +1824,14 @@ NS(test_main)(void *arg)
s = routerset_to_string(set); s = routerset_to_string(set);
tt_str_op(s, ==, ""); tt_str_op(s, ==, "");
tor_free(s); tor_free(s);
routerset_free(set); set = NULL;
set = routerset_new(); set = routerset_new();
smartlist_add(set->list, tor_strndup("a", 1)); smartlist_add(set->list, tor_strndup("a", 1));
s = routerset_to_string(set); s = routerset_to_string(set);
tt_str_op(s, ==, "a"); tt_str_op(s, ==, "a");
tor_free(s); tor_free(s);
routerset_free(set); set = NULL;
set = routerset_new(); set = routerset_new();
smartlist_add(set->list, tor_strndup("a", 1)); smartlist_add(set->list, tor_strndup("a", 1));
@ -1836,12 +1839,11 @@ NS(test_main)(void *arg)
s = routerset_to_string(set); s = routerset_to_string(set);
tt_str_op(s, ==, "a,b"); tt_str_op(s, ==, "a,b");
tor_free(s); tor_free(s);
routerset_free(set); set = NULL;
done: done:
if (s) tor_free(s);
tor_free(s); routerset_free((routerset_t *)set);
if (set)
routerset_free((routerset_t *)set);
} }
#undef NS_SUBMODULE #undef NS_SUBMODULE
@ -2036,24 +2038,22 @@ NS(test_main)(void *arg)
void void
NS(smartlist_free)(smartlist_t *s) NS(smartlist_free)(smartlist_t *s)
{ {
(void)s;
CALLED(smartlist_free)++; CALLED(smartlist_free)++;
smartlist_free__real(s);
} }
void void
NS(strmap_free)(strmap_t *map, void (*free_val)(void*)) NS(strmap_free)(strmap_t *map, void (*free_val)(void*))
{ {
(void)map;
(void)free_val;
CALLED(strmap_free)++; CALLED(strmap_free)++;
strmap_free__real(map, free_val);
} }
void void
NS(digestmap_free)(digestmap_t *map, void (*free_val)(void*)) NS(digestmap_free)(digestmap_t *map, void (*free_val)(void*))
{ {
(void)map;
(void)free_val;
CALLED(digestmap_free)++; CALLED(digestmap_free)++;
digestmap_free__real(map, free_val);
} }
#undef NS_SUBMODULE #undef NS_SUBMODULE