Fix: Throw a FieldError exception when get_value() fails

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

diff --git a/formats/ctf/events.c b/formats/ctf/events.c
index 3cf3b88f710234c851f5bf8ece79c2ab10fff594..af376a4412b8c8b0c807cf432748302cda5301a8 100644 (file)
--- a/formats/ctf/events.c
+++ b/formats/ctf/events.c
@@ -289,8 +289,8 @@ struct bt_context *bt_ctf_event_get_context(const struct bt_ctf_event *ctf_event
        cfs = container_of(event->stream, const struct ctf_file_stream,
                        parent);
        trace = cfs->parent.stream_class->trace;
-       if (trace->ctx)
-               ret = trace->ctx;
+       if (trace->parent.ctx)
+               ret = trace->parent.ctx;
 
        return ret;
 }
@@ -309,8 +309,8 @@ int bt_ctf_event_get_handle_id(const struct bt_ctf_event *ctf_event)
        cfs = container_of(event->stream, const struct ctf_file_stream,
                        parent);
        trace = cfs->parent.stream_class->trace;
-       if (trace->handle)
-               ret = trace->handle->id;
+       if (trace->parent.handle)
+               ret = trace->parent.handle->id;
 
        return ret;
 }
@@ -653,11 +653,11 @@ int bt_ctf_get_decl_fields(struct bt_ctf_event_decl *event_decl,
        gpointer *ret_list = NULL;
        GPtrArray *fields_array = NULL;
        int ret = 0;
-       *count = 0;
 
        if (!event_decl || !list || !count)
                return -EINVAL;
 
+       *count = 0;
        switch (scope) {
        case BT_EVENT_CONTEXT:
                if (event_decl->context_decl) {