From: Julien Desfossez <jdesfossez@efficios.com>
Date: Tue, 28 Aug 2012 04:01:39 +0000 (-0400)
Subject: Fix: check return value of get_char_array
X-Git-Tag: v1.0.0-rc6~33
X-Git-Url: http://git.efficios.com/?p=babeltrace.git;a=commitdiff_plain;h=885885bfa41c56f7615d635d348ba7cec34b4684;ds=sidebyside

Fix: check return value of get_char_array

Arrays that are not char arrays will cause a segfault if we don't check
the return value of get_char_array before accessing the str pointer.

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

diff --git a/formats/ctf/events.c b/formats/ctf/events.c
index 890956e9..efcd6f05 100644
--- a/formats/ctf/events.c
+++ b/formats/ctf/events.c
@@ -515,12 +515,18 @@ int64_t bt_ctf_get_int64(const struct definition *field)
 char *bt_ctf_get_char_array(const struct definition *field)
 {
 	char *ret = NULL;
+	GString *char_array;
 
-	if (field && bt_ctf_field_type(field) == CTF_TYPE_ARRAY)
-		ret = get_char_array(field)->str;
-	else
-		bt_ctf_field_set_error(-EINVAL);
+	if (field && bt_ctf_field_type(field) == CTF_TYPE_ARRAY) {
+		char_array = get_char_array(field);
+		if (char_array) {
+			ret = char_array->str;
+			goto end;
+		}
+	}
+	bt_ctf_field_set_error(-EINVAL);
 
+end:
 	return ret;
 }