X-Git-Url: http://git.efficios.com/?p=babeltrace.git;a=blobdiff_plain;f=formats%2Fctf%2Fcallbacks.c;h=0c221f9da684e5dfe58b058548be4263fdbdabc7;hp=05ddf499a76c915bf2332106d9edbe8d179e7405;hb=7f89ddce05f0a5c985d6333fbe70a992da4bd244;hpb=09349576c27925daab50630bff7d219eebc8df98

diff --git a/formats/ctf/callbacks.c b/formats/ctf/callbacks.c
index 05ddf499..0c221f9d 100644
--- a/formats/ctf/callbacks.c
+++ b/formats/ctf/callbacks.c
@@ -73,8 +73,12 @@ int bt_ctf_iter_add_callback(struct bt_ctf_iter *iter,
 	int i, stream_id;
 	gpointer *event_id_ptr;
 	unsigned long event_id;
-	struct trace_collection *tc = iter->parent.ctx->tc;
+	struct trace_collection *tc;
 
+	if (!iter || !callback)
+		return -EINVAL;
+
+	tc = iter->parent.ctx->tc;
 	for (i = 0; i < tc->array->len; i++) {
 		struct ctf_trace *tin;
 		struct trace_descriptor *td_read;
@@ -181,6 +185,8 @@ void process_callbacks(struct bt_ctf_iter *iter,
 	enum bt_cb_ret ret;
 	struct bt_ctf_event ctf_data;
 
+	assert(iter && stream);
+
 	ret = extract_ctf_stream_event(stream, &ctf_data);
 
 	/* process all events callback first */