Fix: don't call iterator finalize more than once

A finalize may have side-effects that trigger port removal, thus calling
finalize again. Ensure it is not called more than once.

Signed-off-by: Mathieu Desnoyers <mathieu.desnoyers@efficios.com>
Signed-off-by: Jérémie Galarneau <jeremie.galarneau@efficios.com>

diff --git a/lib/graph/iterator.c b/lib/graph/iterator.c
index 1bfe3495051be8caa8d22d15b3532cceea794b65..bda2dfd3cfcd6f15558ac1a6631f6c710f4b9bc0 100644 (file)
--- a/lib/graph/iterator.c
+++ b/lib/graph/iterator.c
@@ -349,6 +349,12 @@ void bt_notification_iterator_finalize(
                break;
        }
 
+       if (iterator->state == BT_NOTIFICATION_ITERATOR_STATE_ENDED) {
+               iterator->state = BT_NOTIFICATION_ITERATOR_STATE_FINALIZED_AND_ENDED;
+       } else {
+               iterator->state = BT_NOTIFICATION_ITERATOR_STATE_FINALIZED;
+       }
+
        assert(iterator->upstream_component);
        comp_class = iterator->upstream_component->class;
 
@@ -380,12 +386,6 @@ void bt_notification_iterator_finalize(
                        bt_private_notification_iterator_from_notification_iterator(iterator));
        }
 
-       if (iterator->state == BT_NOTIFICATION_ITERATOR_STATE_ENDED) {
-               iterator->state = BT_NOTIFICATION_ITERATOR_STATE_FINALIZED_AND_ENDED;
-       } else {
-               iterator->state = BT_NOTIFICATION_ITERATOR_STATE_FINALIZED;
-       }
-
        iterator->upstream_component = NULL;
        iterator->upstream_port = NULL;
 }