X-Git-Url: http://git.efficios.com/?a=blobdiff_plain;f=formats%2Fctf%2Fevents.c;h=af376a4412b8c8b0c807cf432748302cda5301a8;hb=90131a325727abff135b9d67f814c79269ec5d13;hp=1c4813da88147f51a00491913c03c90d47c7488f;hpb=45807148b2641aa049f821a7c71c4c7246c7692e;p=babeltrace.git

diff --git a/formats/ctf/events.c b/formats/ctf/events.c
index 1c4813da..af376a44 100644
--- a/formats/ctf/events.c
+++ b/formats/ctf/events.c
@@ -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) {