X-Git-Url: http://git.efficios.com/?p=babeltrace.git;a=blobdiff_plain;f=lib%2Fiterator.c;h=ca6e5917e449b328f6ba0869397297b60d7e4e57;hp=e50846f4cb6179a7cd2eb1ac1903f042d4da5f1e;hb=e003e87103a3fd72d543ec3191c20df56599b0f5;hpb=ec4c2b5ccbda1625a9011c27994186bf78cc9d72

diff --git a/lib/iterator.c b/lib/iterator.c
index e50846f4..ca6e5917 100644
--- a/lib/iterator.c
+++ b/lib/iterator.c
@@ -436,6 +436,11 @@ int bt_iter_init(struct bt_iter *iter,
 	int i, stream_id;
 	int ret = 0;
 
+	if (ctx->current_iterator) {
+		ret = -1;
+		goto error_ctx;
+	}
+
 	iter->stream_heap = g_new(struct ptr_heap, 1);
 	iter->end_pos = end_pos;
 	bt_context_get(ctx);
@@ -486,12 +491,14 @@ int bt_iter_init(struct bt_iter *iter,
 		}
 	}
 
+	ctx->current_iterator = iter;
 	return 0;
 
 error:
 	heap_free(iter->stream_heap);
 error_heap_init:
 	g_free(iter->stream_heap);
+error_ctx:
 	return ret;
 }
 
@@ -517,6 +524,7 @@ void bt_iter_fini(struct bt_iter *iter)
 		heap_free(iter->stream_heap);
 		g_free(iter->stream_heap);
 	}
+	iter->ctx->current_iterator = NULL;
 	bt_context_put(iter->ctx);
 }