X-Git-Url: http://git.efficios.com/?a=blobdiff_plain;f=lib%2Fgraph%2Fiterator.c;h=f5dd6d70d9d1019726b964a268f59f733815c269;hb=088d4023b8df17d8cc6f354f15aa1d81038a1c13;hp=cc1228ba7ded6106f189a66d75a264aa4616ca59;hpb=53bc54cd6a867b0549a14edbef056d466e54e537;p=babeltrace.git

diff --git a/lib/graph/iterator.c b/lib/graph/iterator.c
index cc1228ba..f5dd6d70 100644
--- a/lib/graph/iterator.c
+++ b/lib/graph/iterator.c
@@ -445,6 +445,11 @@ void bt_notification_iterator_finalize(
 	assert(iterator);
 
 	switch (iterator->state) {
+	case BT_NOTIFICATION_ITERATOR_STATE_NON_INITIALIZED:
+		/* Skip user finalization if user initialization failed */
+		BT_LOGD("Not finalizing non-initialized notification iterator: "
+			"addr=%p", iterator);
+		return;
 	case BT_NOTIFICATION_ITERATOR_STATE_FINALIZED:
 	case BT_NOTIFICATION_ITERATOR_STATE_FINALIZED_AND_ENDED:
 		/* Already finalized */
@@ -649,7 +654,7 @@ enum bt_connection_status bt_notification_iterator_create(
 	iterator->upstream_component = upstream_comp;
 	iterator->upstream_port = upstream_port;
 	iterator->connection = connection;
-	iterator->state = BT_NOTIFICATION_ITERATOR_STATE_ACTIVE;
+	iterator->state = BT_NOTIFICATION_ITERATOR_STATE_NON_INITIALIZED;
 	BT_LOGD("Created notification iterator: "
 		"upstream-comp-addr=%p, upstream-comp-name=\"%s\", "
 		"upstream-port-addr=%p, upstream-port-name=\"%s\", "