mirrors/tor
1
0
Fork 0
mirror of https://gitlab.torproject.org/tpo/core/tor.git synced 2025-02-25 15:10:48 +01:00
Code Issues Projects Releases Wiki Activity

Fix memory management for #22103 tests

Browse source 
Code movement in the commit introducings tests for #22103 uncovered a
latent memory management bug.

Refactor the log message checking from test_options_checkmsgs() into a
helper test_options_checklog().  This avoids a memory leak (and
possible double-free) in a test failure condition.

Don't reuse variables (especially pointers to allocated memory!) for
multiple unrelated purposes.

Fixes CID 1405778.
This commit is contained in:
Taylor Yu 2017-05-03 07:55:20 -04:00
parent e0b1fd4d3d
commit 7b64f1773d
1 changed files with 31 additions and 17 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

48
src/test/test_options.c
View file

@ -105,6 +105,35 @@ clear_log_messages(void)
"EDE6D711294FADF8E7951F4DE6CA56B58 194.109.206.212:80 7EA6 EAD6 FD83" \
" 083C 538F 4403 8BBF A077 587D D755\n"
static int
test_options_checklog(const char *configuration, int expect_log_severity,
const char *expect_log)
{
int found = 0, ret = -1;
char *actual_log = NULL;
if (messages) {
SMARTLIST_FOREACH_BEGIN(messages, logmsg_t *, m) {
if (m->severity == expect_log_severity &&
strstr(m->msg, expect_log)) {
found = 1;
break;
}
} SMARTLIST_FOREACH_END(m);
}
if (!found) {
actual_log = dump_logs();
TT_DIE(("Expected log message [%s] %s from <%s>, but got <%s>.",
log_level_to_string(expect_log_severity), expect_log,
configuration, actual_log));
}
ret = 0;
done:
tor_free(actual_log);
return ret;
}
static int
test_options_checkmsgs(const char *configuration,
const char *expect_errmsg,
@ -123,23 +152,8 @@ test_options_checkmsgs(const char *configuration,
configuration, msg));
}
if (expect_log) {
int found = 0;
if (messages) {
SMARTLIST_FOREACH_BEGIN(messages, logmsg_t *, m) {
if (m->severity == expect_log_severity &&
strstr(m->msg, expect_log)) {
found = 1;
break;
}
} SMARTLIST_FOREACH_END(m);
}
if (!found) {
tor_free(msg);
msg = dump_logs();
TT_DIE(("Expected log message [%s] %s from <%s>, but got <%s>.",
log_level_to_string(expect_log_severity), expect_log,
configuration, msg));
}
return test_options_checklog(configuration, expect_log_severity,
expect_log);
}
return 0;