From 46c7e45bc65331d6b43ffc44c7c30265d0a03480 Mon Sep 17 00:00:00 2001 From: Simon Marchi Date: Mon, 31 Jan 2022 12:33:17 -0500 Subject: [PATCH] Fix: lib: fix memory leak in simple_sink_init error path If bt_self_component_sink_add_input_port fails, we don't free the simple_sink_data instance. Move the code to free a simple_sink_data in a new function, simple_sink_data_destroy. Call it from simple_sink_finalize and from simple_sink_init's error path. Change-Id: If8f87ef4a39836e02ed1c125dc8feb160d21cc37 Signed-off-by: Simon Marchi Reviewed-on: https://review.lttng.org/c/babeltrace/+/7196 Reviewed-by: Philippe Proulx Tested-by: jenkins --- src/lib/graph/component-class-sink-simple.c | 27 +++++++++++++++------ 1 file changed, 19 insertions(+), 8 deletions(-) diff --git a/src/lib/graph/component-class-sink-simple.c b/src/lib/graph/component-class-sink-simple.c index 9244adb7..812e3b5f 100644 --- a/src/lib/graph/component-class-sink-simple.c +++ b/src/lib/graph/component-class-sink-simple.c @@ -33,6 +33,15 @@ struct simple_sink_data { struct simple_sink_init_method_data init_method_data; }; +static +void simple_sink_data_destroy(struct simple_sink_data *data) +{ + if (data) { + BT_OBJECT_PUT_REF_AND_RESET(data->msg_iter); + g_free(data); + } +} + static enum bt_component_class_initialize_method_status simple_sink_init( bt_self_component_sink *self_comp, @@ -63,10 +72,13 @@ enum bt_component_class_initialize_method_status simple_sink_init( goto end; } + /* Transfer ownership to component */ bt_self_component_set_data( bt_self_component_sink_as_self_component(self_comp), data); + data = NULL; end: + simple_sink_data_destroy(data); return status; } @@ -76,16 +88,15 @@ void simple_sink_finalize(struct bt_self_component_sink *self_comp) struct simple_sink_data *data = bt_self_component_get_data( bt_self_component_sink_as_self_component(self_comp)); - if (data) { - if (data->init_method_data.finalize_func) { - /* Call user's finalization function */ - data->init_method_data.finalize_func( - data->init_method_data.user_data); - } + BT_ASSERT(data); - BT_OBJECT_PUT_REF_AND_RESET(data->msg_iter); - g_free(data); + if (data->init_method_data.finalize_func) { + /* Call user's finalization function */ + data->init_method_data.finalize_func( + data->init_method_data.user_data); } + + simple_sink_data_destroy(data); } static -- 2.34.1