From: Jérémie Galarneau Date: Fri, 15 Apr 2022 03:26:12 +0000 (-0400) Subject: Tests: fix: leak of trigger in trigger listing tests X-Git-Tag: v2.13.8~18 X-Git-Url: https://git.lttng.org./?a=commitdiff_plain;h=0915ddc8c14b74755303e7ece03b8188d79ace23;p=lttng-tools.git Tests: fix: leak of trigger in trigger listing tests ==1480456==ERROR: LeakSanitizer: detected memory leaks Direct leak of 112 byte(s) in 1 object(s) allocated from: #0 0x7fdb9260cfb9 in __interceptor_calloc /usr/src/debug/gcc/libsanitizer/asan/asan_malloc_linux.cpp:154 #1 0x7fdb9242348d in zmalloc_internal ../../src/common/macros.hpp:60 #2 0x7fdb924295a9 in lttng_trigger* zmalloc() ../../src/common/macros.hpp:89 #3 0x7fdb92423dbe in lttng_trigger_create /home/jgalar/EfficiOS/src/lttng-tools/src/common/trigger.cpp:58 #4 0x56304832331f in register_trigger /home/jgalar/EfficiOS/src/lttng-tools/tests/regression/tools/trigger/utils/register-some-triggers.cpp:24 #5 0x5630483233f1 in register_trigger_action_list_notify /home/jgalar/EfficiOS/src/lttng-tools/tests/regression/tools/trigger/utils/register-some-triggers.cpp:46 #6 0x5630483239a0 in test_session_rotation_conditions /home/jgalar/EfficiOS/src/lttng-tools/tests/regression/tools/trigger/utils/register-some-triggers.cpp:246 #7 0x563048323d4d in main /home/jgalar/EfficiOS/src/lttng-tools/tests/regression/tools/trigger/utils/register-some-triggers.cpp:309 #8 0x7fdb91c6630f in __libc_start_call_main (/usr/lib/libc.so.6+0x2d30f) Signed-off-by: Jérémie Galarneau Change-Id: Ie163989a70f65f9c2c4e93c36cc9fc6ba6bdeeb5 --- diff --git a/tests/regression/tools/trigger/utils/register-some-triggers.c b/tests/regression/tools/trigger/utils/register-some-triggers.c index f4bba2df4..113cd2caf 100644 --- a/tests/regression/tools/trigger/utils/register-some-triggers.c +++ b/tests/regression/tools/trigger/utils/register-some-triggers.c @@ -25,6 +25,9 @@ static void register_trigger(const char *trigger_name, trigger = lttng_trigger_create(condition, action); ret = lttng_register_trigger_with_name(trigger, trigger_name); assert(ret == LTTNG_OK); + lttng_trigger_destroy(trigger); + lttng_condition_destroy(condition); + lttng_action_destroy(action); } /* @@ -43,6 +46,7 @@ static void register_trigger_action_list_notify( action_status = lttng_action_list_add_action( action_list, action_notify); assert(action_status == LTTNG_ACTION_STATUS_OK); + lttng_action_destroy(action_notify); register_trigger(trigger_name, condition, action_list); }