Fix: lib: add NULL check for destroy_listeners in destroy_component_class

[babeltrace.git] / src / lib / graph / iterator.c

diff --git a/src/lib/graph/iterator.c b/src/lib/graph/iterator.c
index ccc12d615f9c203d5002580702c8f07317c08e16..fd49c27ef15ebb03511b65a65d68781f74a3b174 100644 (file)
--- a/src/lib/graph/iterator.c
+++ b/src/lib/graph/iterator.c
@@ -201,6 +201,7 @@ void bt_message_iterator_try_finalize(
                        BT_LIB_LOGD("Calling user's finalization method: %!+i",
                                iterator);
                        method(iterator);
+                       BT_ASSERT_POST_NO_ERROR("bt_message_iterator_class_finalize_method");
 
                        if (saved_error) {
                                BT_CURRENT_THREAD_MOVE_ERROR_AND_RESET(saved_error);
@@ -1285,6 +1286,16 @@ int auto_seek_handle_message(
                const struct bt_message_packet *packet_msg =
                        (const void *) msg;
 
+               if (msg->type == BT_MESSAGE_TYPE_PACKET_BEGINNING
+                               && !packet_msg->packet->stream->class->packets_have_beginning_default_clock_snapshot) {
+                       goto skip_msg;
+               }
+
+               if (msg->type == BT_MESSAGE_TYPE_PACKET_END
+                               && !packet_msg->packet->stream->class->packets_have_end_default_clock_snapshot) {
+                       goto skip_msg;
+               }
+
                clk_snapshot = packet_msg->default_cs;
                BT_ASSERT_POST_DEV(NEXT_METHOD_NAME,
                        "packet-message-has-default-clock-snapshot",
@@ -1299,6 +1310,16 @@ int auto_seek_handle_message(
                struct bt_message_discarded_items *msg_disc_items =
                        (void *) msg;
 
+               if (msg->type == BT_MESSAGE_TYPE_DISCARDED_EVENTS &&
+                               !msg_disc_items->stream->class->discarded_events_have_default_clock_snapshots) {
+                       goto skip_msg;
+               }
+
+               if (msg->type == BT_MESSAGE_TYPE_DISCARDED_PACKETS &&
+                               !msg_disc_items->stream->class->discarded_packets_have_default_clock_snapshots) {
+                       goto skip_msg;
+               }
+
                BT_ASSERT_POST_DEV(NEXT_METHOD_NAME,
                        "discarded-events-packets-message-has-default-clock-snapshot",
                        msg_disc_items->default_begin_cs &&