Fix: flt.utils.muxer: Explicit null dereferenced

[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 ecd5d8d92f059147f0bec1f01dceae1b6ed94b8a..f67955d1d94de57e385120b2df08b79b197950ee 100644 (file)
--- a/src/plugins/utils/muxer/muxer.c
+++ b/src/plugins/utils/muxer/muxer.c
@@ -946,7 +946,13 @@ muxer_msg_iter_youngest_upstream_msg_iter(
                        goto end;
                }
 
-               if (msg_ts_ns < youngest_ts_ns) {
+               /*
+                * Update the current message iterator if it has not been set
+                * yet, or if its current message has a timestamp smaller than
+                * the previously selected youngest message.
+                */
+               if (G_UNLIKELY(*muxer_upstream_msg_iter == NULL) ||
+                               msg_ts_ns < youngest_ts_ns) {
                        *muxer_upstream_msg_iter =
                                cur_muxer_upstream_msg_iter;
                        youngest_ts_ns = msg_ts_ns;