nihilist/tor
1
0
Fork 0
mirror of https://gitlab.torproject.org/tpo/core/tor.git synced 2024-11-24 12:23:32 +01:00
Code Issues Packages Projects Releases Wiki Activity

Fix memory leaks in test_config_parse_transport_options_line

Browse Source
This commit is contained in:
Nick Mathewson 2013-07-15 13:26:47 -04:00
parent 713ff2f5ef
commit 31871f7d77
1 changed files with 15 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

20
src/test/test_config.c
View File

@ -441,7 +441,7 @@ test_config_parse_bridge_line(void *arg)
static void static void
test_config_parse_transport_options_line(void *arg) test_config_parse_transport_options_line(void *arg)
{ {
smartlist_t *options_sl = NULL; smartlist_t *options_sl = NULL, *sl_tmp = NULL;
(void) arg; (void) arg;
@ -462,7 +462,7 @@ test_config_parse_transport_options_line(void *arg)
} }
{ /* correct -- no transport specified */ { /* correct -- no transport specified */
smartlist_t *sl_tmp = smartlist_new(); sl_tmp = smartlist_new();
smartlist_add_asprintf(sl_tmp, "ladi=dadi"); smartlist_add_asprintf(sl_tmp, "ladi=dadi");
smartlist_add_asprintf(sl_tmp, "weliketo=party"); smartlist_add_asprintf(sl_tmp, "weliketo=party");
@ -474,12 +474,14 @@ test_config_parse_transport_options_line(void *arg)
SMARTLIST_FOREACH(sl_tmp, char *, s, tor_free(s)); SMARTLIST_FOREACH(sl_tmp, char *, s, tor_free(s));
smartlist_free(sl_tmp); smartlist_free(sl_tmp);
sl_tmp = NULL;
SMARTLIST_FOREACH(options_sl, char *, s, tor_free(s)); SMARTLIST_FOREACH(options_sl, char *, s, tor_free(s));
smartlist_free(options_sl); smartlist_free(options_sl);
options_sl = NULL;
} }
{ /* correct -- correct transport specified */ { /* correct -- correct transport specified */
smartlist_t *sl_tmp = smartlist_new(); sl_tmp = smartlist_new();
smartlist_add_asprintf(sl_tmp, "ladi=dadi"); smartlist_add_asprintf(sl_tmp, "ladi=dadi");
smartlist_add_asprintf(sl_tmp, "weliketo=party"); smartlist_add_asprintf(sl_tmp, "weliketo=party");
@ -488,15 +490,23 @@ test_config_parse_transport_options_line(void *arg)
"rook"); "rook");
test_assert(options_sl); test_assert(options_sl);
test_assert(smartlist_strings_eq(options_sl, sl_tmp)); test_assert(smartlist_strings_eq(options_sl, sl_tmp));
SMARTLIST_FOREACH(sl_tmp, char *, s, tor_free(s)); SMARTLIST_FOREACH(sl_tmp, char *, s, tor_free(s));
smartlist_free(sl_tmp); smartlist_free(sl_tmp);
sl_tmp = NULL;
SMARTLIST_FOREACH(options_sl, char *, s, tor_free(s)); SMARTLIST_FOREACH(options_sl, char *, s, tor_free(s));
smartlist_free(options_sl); smartlist_free(options_sl);
options_sl = NULL;
} }
done: done:
; if (options_sl) {
SMARTLIST_FOREACH(options_sl, char *, s, tor_free(s));
smartlist_free(options_sl);
}
if (sl_tmp) {
SMARTLIST_FOREACH(sl_tmp, char *, s, tor_free(s));
smartlist_free(sl_tmp);
}
} }
#define CONFIG_TEST(name, flags) \ #define CONFIG_TEST(name, flags) \