Add out-of-bound checks

[babeltrace.git] / formats / ctf / types / enum.c

diff --git a/formats/ctf/types/enum.c b/formats/ctf/types/enum.c
index a1d034c38b79f39903e2a593e9aed3e1e68b31ee..f8fc9e57f1b0f423e0e24c7dd21f2db170c80b11 100644 (file)
--- a/formats/ctf/types/enum.c
+++ b/formats/ctf/types/enum.c
@@ -3,7 +3,7 @@
  *
  * Enumeration mapping strings (quarks) from/to integers.
  *
- * Copyright 2010 - Mathieu Desnoyers <mathieu.desnoyers@efficios.com>
+ * Copyright 2010, 2011 - Mathieu Desnoyers <mathieu.desnoyers@efficios.com>
  *
  * Permission is hereby granted, free of charge, to any person obtaining a copy
  * of this software and associated documentation files (the "Software"), to deal
@@ -20,39 +20,42 @@
 #include <stdint.h>
 #include <glib.h>
 
-GQuark ctf_enum_read(struct stream_pos *pos,
-                    const struct type_class_enum *src)
+int ctf_enum_read(struct stream_pos *ppos, struct definition *definition)
 {
-       struct type_class_integer *int_class = &src->p;
-
-       if (!int_class->signedness) {
-               uint64_t v;
-
-               v = ctf_uint_read(pos, int_class);
-               return enum_uint_to_quark(src, v);
-       } else {
-               int64_t v;
-
-               v = fsrc->ctf_int_read(pos, int_class);
-               return enum_int_to_quark(src, v);
-       }
+       struct definition_enum *enum_definition =
+               container_of(definition, struct definition_enum, p);
+       const struct declaration_enum *enum_declaration =
+               enum_definition->declaration;
+       struct definition_integer *integer_definition =
+               enum_definition->integer;
+       const struct declaration_integer *integer_declaration =
+               integer_definition->declaration;
+       GArray *qs;
+       int ret;
+
+       ret = ctf_integer_read(ppos, &integer_definition->p);
+       if (ret)
+               return ret;
+       if (!integer_declaration->signedness)
+               qs = enum_uint_to_quark_set(enum_declaration,
+                       integer_definition->value._unsigned);
+       else
+               qs = enum_int_to_quark_set(enum_declaration,
+                       integer_definition->value._signed);
+       assert(qs);
+       /* unref previous quark set */
+       if (enum_definition->value)
+               g_array_unref(enum_definition->value);
+       enum_definition->value = qs;
+       return 0;
 }
 
-size_t ctf_enum_write(struct stream_pos *pos,
-                     const struct type_class_enum *dest,
-                     GQuark q)
+int ctf_enum_write(struct stream_pos *pos, struct definition *definition)
 {
-       struct type_class_integer *int_class = &dest->p;
-
-       if (!int_class->signedness) {
-               uint64_t v;
-
-               v = enum_quark_to_uint(dest, q);
-               return ctf_uint_write(pos, int_class, v);
-       } else {
-               int64_t v;
+       struct definition_enum *enum_definition =
+               container_of(definition, struct definition_enum, p);
+       struct definition_integer *integer_definition =
+               enum_definition->integer;
 
-               v = enum_quark_to_int(dest, q);
-               return ctf_int_write(pos, int_class, v);
-       }
+       return ctf_integer_write(pos, &integer_definition->p);
 }