Fix: complete error handling of babeltrace API

[babeltrace.git] / formats / ctf / iterator.c

diff --git a/formats/ctf/iterator.c b/formats/ctf/iterator.c
index 5cc7dbad14de5d79ae66ba0fcffefba055983b1e..ec74e59029381e73acc5cbf97a7c43ae4889fedf 100644 (file)
--- a/formats/ctf/iterator.c
+++ b/formats/ctf/iterator.c
@@ -38,6 +38,9 @@ struct bt_ctf_iter *bt_ctf_iter_create(struct bt_context *ctx,
        struct bt_ctf_iter *iter;
        int ret;
 
+       if (!ctx)
+               return NULL;
+
        iter = g_new0(struct bt_ctf_iter, 1);
        ret = bt_iter_init(&iter->parent, ctx, begin_pos, end_pos);
        if (ret) {
@@ -57,6 +60,8 @@ void bt_ctf_iter_destroy(struct bt_ctf_iter *iter)
        struct bt_callback_chain *bt_chain;
        int i, j;
 
+       assert(iter);
+
        /* free all events callbacks */
        if (iter->main_callbacks.callback)
                g_array_free(iter->main_callbacks.callback, TRUE);
@@ -83,28 +88,38 @@ void bt_ctf_iter_destroy(struct bt_ctf_iter *iter)
 
 struct bt_iter *bt_ctf_get_iter(struct bt_ctf_iter *iter)
 {
+       if (!iter)
+               return NULL;
+
        return &iter->parent;
 }
 
-struct ctf_event_definition *bt_ctf_iter_read_event(struct bt_ctf_iter *iter)
+struct bt_ctf_event *bt_ctf_iter_read_event(struct bt_ctf_iter *iter)
 {
        struct ctf_file_stream *file_stream;
-       struct ctf_event_definition *ret = &iter->current_ctf_event;
+       struct bt_ctf_event *ret;
        struct ctf_stream_definition *stream;
 
+       /*
+        * We do not want to fail for any other reason than end of
+        * trace, hence the assert.
+        */
+       assert(iter);
+
+       ret = &iter->current_ctf_event;
        file_stream = heap_maximum(iter->parent.stream_heap);
        if (!file_stream) {
                /* end of file for all streams */
                goto stop;
        }
        stream = &file_stream->parent;
-       ret = g_ptr_array_index(stream->events_by_id,
+       ret->parent = g_ptr_array_index(stream->events_by_id,
                        stream->event_id);
 
-       if (ret->stream->stream_id > iter->callbacks->len)
+       if (ret->parent->stream->stream_id > iter->callbacks->len)
                goto end;
 
-       process_callbacks(iter, ret->stream);
+       process_callbacks(iter, ret->parent->stream);
 
 end:
        return ret;