X-Git-Url: http://git.efficios.com/?p=babeltrace.git;a=blobdiff_plain;f=formats%2Fctf%2Fevents.c;h=d9460b169e98e68ebb0c0f6a9630b4f563f4d522;hp=5a6f6255b7eed0b33e498bdbca061390daacd8d6;hb=1b8455b701df7ac196e35795b9ab8ef2d402058d;hpb=2b77e6a6ff6a0b46ee3bd607d1d75f2d20af5ea0

diff --git a/formats/ctf/events.c b/formats/ctf/events.c
index 5a6f6255..d9460b16 100644
--- a/formats/ctf/events.c
+++ b/formats/ctf/events.c
@@ -168,7 +168,7 @@ const char *bt_ctf_event_name(const struct bt_ctf_event *ctf_event)
 
 const char *bt_ctf_field_name(const struct definition *def)
 {
-	if (!def)
+	if (!def || !def->name)
 		return NULL;
 
 	return rem_(g_quark_to_string(def->name));
@@ -613,7 +613,7 @@ int bt_ctf_get_event_decl_list(int handle_id, struct bt_context *ctx,
 		unsigned int *count)
 {
 	struct bt_trace_handle *handle;
-	struct trace_descriptor *td;
+	struct bt_trace_descriptor *td;
 	struct ctf_trace *tin;
 
 	if (!ctx || !list || !count)