From 7388fc97d3fe1b9cc06975d0747f1cc09c5e83e2 Mon Sep 17 00:00:00 2001 From: Mathieu Desnoyers Date: Wed, 11 Apr 2012 07:41:30 -0400 Subject: [PATCH] Fix: warn, and don't assert, when reading a value outside enum range Signed-off-by: Mathieu Desnoyers --- formats/ctf/types/enum.c | 15 ++++++++++++--- 1 file changed, 12 insertions(+), 3 deletions(-) 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 +#include #include #include @@ -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); -- 2.34.1