Fix: flt-utils.muxer: reference leak in muxer_msg_iter_add_upstream_msg_iter error...

[babeltrace.git] / src / plugins / utils / muxer / muxer.c

diff --git a/src/plugins/utils/muxer/muxer.c b/src/plugins/utils/muxer/muxer.c
index db8b86bd817c94c7d5a6dd9a56dc433c0554421a..40ada9389e26fe17ee4abc62abb0dd673d28b6e6 100644 (file)
--- a/src/plugins/utils/muxer/muxer.c
+++ b/src/plugins/utils/muxer/muxer.c
@@ -187,7 +187,7 @@ int muxer_msg_iter_add_upstream_msg_iter(struct muxer_msg_iter *muxer_msg_iter,
        goto end;
 
 error:
-       g_free(muxer_upstream_msg_iter);
+       destroy_muxer_upstream_msg_iter(muxer_upstream_msg_iter);
        ret = -1;
 
 end:
@@ -580,7 +580,7 @@ int get_msg_ts_ns(struct muxer_comp *muxer_comp,
 
                break;
        case BT_MESSAGE_TYPE_MESSAGE_ITERATOR_INACTIVITY:
-               clock_snapshot = bt_message_message_iterator_inactivity_borrow_default_clock_snapshot_const(
+               clock_snapshot = bt_message_message_iterator_inactivity_borrow_clock_snapshot_const(
                        msg);
                break;
        default:
@@ -852,7 +852,7 @@ muxer_msg_iter_youngest_upstream_msg_iter(
                                BT_MESSAGE_TYPE_MESSAGE_ITERATOR_INACTIVITY)) {
                        const bt_clock_snapshot *cs;
 
-                       cs = bt_message_message_iterator_inactivity_borrow_default_clock_snapshot_const(
+                       cs = bt_message_message_iterator_inactivity_borrow_clock_snapshot_const(
                                msg);
                        ret = validate_clock_class(muxer_msg_iter, muxer_comp,
                                bt_clock_snapshot_borrow_clock_class_const(cs));
@@ -1039,7 +1039,8 @@ bt_message_iterator_class_next_method_status muxer_msg_iter_do_next_one(
 {
        bt_message_iterator_class_next_method_status status;
        struct muxer_upstream_msg_iter *muxer_upstream_msg_iter = NULL;
-       int64_t next_return_ts;
+       /* Initialize to avoid -Wmaybe-uninitialized warning with gcc 4.8. */
+       int64_t next_return_ts = 0;
 
        status = validate_muxer_upstream_msg_iters(muxer_msg_iter);
        if (status != BT_MESSAGE_ITERATOR_CLASS_NEXT_METHOD_STATUS_OK) {
@@ -1276,12 +1277,13 @@ BT_HIDDEN
 bt_message_iterator_class_initialize_method_status muxer_msg_iter_init(
                bt_self_message_iterator *self_msg_iter,
                bt_self_message_iterator_configuration *config,
-               bt_self_component *self_comp,
                bt_self_component_port_output *port)
 {
        struct muxer_comp *muxer_comp = NULL;
        struct muxer_msg_iter *muxer_msg_iter = NULL;
        bt_message_iterator_class_initialize_method_status status;
+       bt_self_component *self_comp =
+               bt_self_message_iterator_borrow_component(self_msg_iter);
 
        muxer_comp = bt_self_component_get_data(self_comp);
        BT_ASSERT(muxer_comp);