From: Simon Marchi Date: Sat, 11 Apr 2020 16:52:45 +0000 (-0400) Subject: Fix: flt-utils.muxer: reference leak in muxer_msg_iter_add_upstream_msg_iter error... X-Git-Tag: v2.0.3~7 X-Git-Url: http://git.efficios.com/?p=babeltrace.git;a=commitdiff_plain;h=ec08bdb4b0402de3cc5718db684a18ca3f4e3b4f Fix: flt-utils.muxer: reference leak in muxer_msg_iter_add_upstream_msg_iter error path 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 Reviewed-on: https://review.lttng.org/c/babeltrace/+/3393 Tested-by: jenkins Reviewed-by: Philippe Proulx (cherry picked from commit 6adf99d540b2d239fc49bb64934becf410812c39) Reviewed-on: https://review.lttng.org/c/babeltrace/+/3363 CI-Build: Philippe Proulx --- diff --git a/src/plugins/utils/muxer/muxer.c b/src/plugins/utils/muxer/muxer.c index d1f49550..40ada938 100644 --- 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: