Fix: flt-utils.muxer: reference leak in muxer_msg_iter_add_upstream_msg_iter error...
authorSimon Marchi <simon.marchi@efficios.com>
Sat, 11 Apr 2020 16:52:45 +0000 (12:52 -0400)
committerPhilippe Proulx <eeppeliteloop@gmail.com>
Mon, 13 Apr 2020 13:21:00 +0000 (09:21 -0400)
Let's say we fail to allocate `muxer_upstream_msg_iter->msgs`, we will have
already gotten a reference on `self_msg_iter`, which we need to put.  Calling
destroy_muxer_upstream_msg_iter ensures we do that.

Change-Id: I9b113d2e335d529599cb9197c39c8675915508e5
Signed-off-by: Simon Marchi <simon.marchi@efficios.com>
Reviewed-on: https://review.lttng.org/c/babeltrace/+/3393
Tested-by: jenkins <jenkins@lttng.org>
Reviewed-by: Philippe Proulx <eeppeliteloop@gmail.com>
(cherry picked from commit 6adf99d540b2d239fc49bb64934becf410812c39)
Reviewed-on: https://review.lttng.org/c/babeltrace/+/3363
CI-Build: Philippe Proulx <eeppeliteloop@gmail.com>

src/plugins/utils/muxer/muxer.c

index d1f4955099f72031284166a913ded30197e4d681..40ada9389e26fe17ee4abc62abb0dd673d28b6e6 100644 (file)
@@ -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:
This page took 0.025626 seconds and 4 git commands to generate.