Fix filter.utils.muxer: NULL dereference in logging statement

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

diff --git a/plugins/utils/muxer/muxer.c b/plugins/utils/muxer/muxer.c
index 8a4ae4e122ba554a1ebe45f5c0997d4651268380..431530bb08b0ad69098859c520f0af052e6f52b5 100644 (file)
--- a/plugins/utils/muxer/muxer.c
+++ b/plugins/utils/muxer/muxer.c
@@ -240,7 +240,8 @@ void destroy_muxer_comp(struct muxer_comp *muxer_comp)
 
        BT_LOGD("Destroying muxer component: muxer-comp-addr=%p, "
                "muxer-notif-iter-count=%u", muxer_comp,
-               muxer_comp->muxer_notif_iters->len);
+               muxer_comp->muxer_notif_iters ?
+                       muxer_comp->muxer_notif_iters->len : 0);
 
        if (muxer_comp->muxer_notif_iters) {
                g_ptr_array_free(muxer_comp->muxer_notif_iters, TRUE);
@@ -1061,11 +1062,7 @@ struct bt_notification_iterator_next_return muxer_notif_iter_do_next(
                next_return.status =
                        validate_muxer_upstream_notif_iters(muxer_notif_iter);
                if (next_return.status != BT_NOTIFICATION_ITERATOR_STATUS_OK) {
-                       BT_LOGE("Cannot validate upstream notification iterator wrappers for muxer's notification iterator: "
-                               "muxer-comp-addr=%p, muxer-notif-iter-addr=%p, "
-                               "status=%s",
-                               muxer_comp, muxer_notif_iter,
-                               bt_notification_iterator_status_string(next_return.status));
+                       /* validate_muxer_upstream_notif_iters() logs details */
                        goto end;
                }