From c93133184e24b573c88481652157c1aee75d1679 Mon Sep 17 00:00:00 2001 From: Philippe Proulx Date: Tue, 22 Nov 2016 15:57:21 -0500 Subject: [PATCH] babeltrace-cfg: always copy the parameters of component instances MIME-Version: 1.0 Content-Type: text/plain; charset=utf8 Content-Transfer-Encoding: 8bit Signed-off-by: Philippe Proulx Signed-off-by: Jérémie Galarneau --- converter/babeltrace-cfg.c | 14 ++++++++++++-- 1 file changed, 12 insertions(+), 2 deletions(-) diff --git a/converter/babeltrace-cfg.c b/converter/babeltrace-cfg.c index a7c5b12a..67c0dbe8 100644 --- a/converter/babeltrace-cfg.c +++ b/converter/babeltrace-cfg.c @@ -2461,7 +2461,12 @@ struct bt_config *bt_config_from_args(int argc, char *argv[], int *exit_code) assert(cur_base_params); bt_put(cur_cfg_comp->params); - cur_cfg_comp->params = bt_get(cur_base_params); + cur_cfg_comp->params = bt_value_copy(cur_base_params); + if (!cur_cfg_comp) { + print_err_oom(); + goto end; + } + cur_cfg_comp->begin_ns = cur_base_begin_ns; cur_cfg_comp->end_ns = cur_base_end_ns; cur_cfg_comp_dest = BT_CONFIG_COMPONENT_DEST_SOURCE; @@ -2520,7 +2525,12 @@ struct bt_config *bt_config_from_args(int argc, char *argv[], int *exit_code) assert(cur_base_params); bt_put(cur_cfg_comp->params); - cur_cfg_comp->params = bt_get(cur_base_params); + cur_cfg_comp->params = bt_value_copy(cur_base_params); + if (!cur_cfg_comp) { + print_err_oom(); + goto end; + } + cur_cfg_comp_dest = BT_CONFIG_COMPONENT_DEST_SINK; cur_cfg_comp_params_set = false; break; -- 2.34.1