From: Mathieu Desnoyers <mathieu.desnoyers@efficios.com>
Date: Wed, 11 Apr 2012 11:41:30 +0000 (-0400)
Subject: Fix: warn, and don't assert, when reading a value outside enum range
X-Git-Tag: v1.0.0-rc1~9
X-Git-Url: http://git.efficios.com/?p=babeltrace.git;a=commitdiff_plain;h=7388fc97d3fe1b9cc06975d0747f1cc09c5e83e2

Fix: warn, and don't assert, when reading a value outside enum range

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

diff --git a/formats/ctf/types/enum.c b/formats/ctf/types/enum.c
index c2b50fd5..e0a2b4d4 100644
--- a/formats/ctf/types/enum.c
+++ b/formats/ctf/types/enum.c
@@ -19,6 +19,7 @@
  */
 
 #include <babeltrace/ctf/types.h>
+#include <inttypes.h>
 #include <stdint.h>
 #include <glib.h>
 
@@ -38,13 +39,21 @@ int ctf_enum_read(struct stream_pos *ppos, struct definition *definition)
 	ret = ctf_integer_read(ppos, &integer_definition->p);
 	if (ret)
 		return ret;
-	if (!integer_declaration->signedness)
+	if (!integer_declaration->signedness) {
 		qs = enum_uint_to_quark_set(enum_declaration,
 			integer_definition->value._unsigned);
-	else
+		if (!qs) {
+			fprintf(stderr, "[warning] Unknown value %" PRIu64 " in enum.\n",
+				integer_definition->value._unsigned);
+		}
+	} else {
 		qs = enum_int_to_quark_set(enum_declaration,
 			integer_definition->value._signed);
-	assert(qs);
+		if (!qs) {
+			fprintf(stderr, "[warning] Unknown value %" PRId64 " in enum.\n",
+				integer_definition->value._signed);
+		}
+	}
 	/* unref previous quark set */
 	if (enum_definition->value)
 		g_array_unref(enum_definition->value);