Fix type free memleak

[babeltrace.git] / types / integer.c

diff --git a/types/integer.c b/types/integer.c
index b338a5913971f86f7787c6a9d4d3a2db4b6778e9..bafb6cb7d1c277f7de321513bfbad08c44ce55a4 100644 (file)
--- a/types/integer.c
+++ b/types/integer.c
@@ -20,6 +20,7 @@
 
 #include <babeltrace/compiler.h>
 #include <babeltrace/align.h>
+#include <babeltrace/types.h>
 #include <stdint.h>
 
 size_t integer_copy(unsigned char *dest, const struct format *fdest, 
@@ -47,6 +48,18 @@ size_t integer_copy(unsigned char *dest, const struct format *fdest,
        }
 }
 
+void integer_type_free(struct type_class_integer *int_class)
+{
+       g_free(int_class);
+}
+
+static void _integer_type_free(struct type_class *type_class)
+{
+       struct type_class_integer *int_class =
+               container_of(type_class, struct type_class_integer, p);
+       integer_type_free(int_class);
+}
+
 struct type_class_integer *integer_type_new(const char *name,
                                            size_t start_offset,
                                            size_t len, int byte_order,
@@ -56,13 +69,11 @@ struct type_class_integer *integer_type_new(const char *name,
        struct type_class_integer *int_class;
        int ret;
 
-       /*
-        * Freed when type is unregistered.
-        */
        int_class = g_new(struct type_class_integer, 1);
        int_class->p.name = g_quark_from_string(name);
        int_class->p.alignment = alignment;
        int_class->p.copy = integer_copy;
+       int_class->p.free = _integer_type_free;
        int_class->len = len;
        int_class->byte_order = byte_order;
        int_class->signedness = signedness;
@@ -75,9 +86,3 @@ struct type_class_integer *integer_type_new(const char *name,
        }
        return int_class;
 }
-
-void integer_type_free(struct type_class_integer *int_class)
-{
-       if (!int_class->name)
-               g_free(int_class);
-}