From: Mathieu Desnoyers <mathieu.desnoyers@efficios.com>
Date: Wed, 15 May 2013 14:49:36 +0000 (+0200)
Subject: Don't dereference before NULL check
X-Git-Tag: v1.1.1~7
X-Git-Url: http://git.efficios.com/?p=babeltrace.git;a=commitdiff_plain;h=3b7335c35a07310fd5fc01d4a0259c367acaaec5

Don't dereference before NULL check

Signed-off-by: Mathieu Desnoyers <mathieu.desnoyers@efficios.com>
---

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