Fix type free memleak

[babeltrace.git] / types / bitfield.c

diff --git a/types/bitfield.c b/types/bitfield.c
index b21fdc917355fc675d05e856cba8906b5d1b6583..a7111b1c454f81a293e4a1dc1244bdd7e0db814a 100644 (file)
--- a/types/bitfield.c
+++ b/types/bitfield.c
@@ -19,6 +19,7 @@
  */
 
 #include <babeltrace/compiler.h>
+#include <babeltrace/types.h>
 #include <stdint.h>
 
 /*
@@ -73,6 +74,18 @@ size_t bitfield_copy(unsigned char *dest, const struct format *fdest,
        }
 }
 
+void bitfield_type_free(struct type_class_bitfield *bitfield_class)
+{
+       g_free(bitfield_class);
+}
+
+static void _bitfield_type_free(struct type_class *type_class)
+{
+       struct type_class_bitfield *bitfield_class =
+               container_of(type_class, struct type_class_bitfield, p);
+       bitfield_type_free(bitfield_class);
+}
+
 struct type_class_bitfield *bitfield_type_new(const char *name,
                                              size_t start_offset,
                                              size_t len, int byte_order,
@@ -83,13 +96,12 @@ struct type_class_bitfield *bitfield_type_new(const char *name,
        struct type_class_integer *int_class;
        int ret;
 
-       /*
-        * Freed when type is unregistered.
-        */
        bitfield_class = g_new(struct type_class_bitfield, 1);
        int_class = &bitfield_class->p;
        int_class->p.name = g_quark_from_string(name);
        int_class->p.alignment = alignment;
+       int_class->p.copy = bitfield_copy;
+       int_class->p.free = _bitfield_type_free;
        int_class->len = len;
        int_class->byte_order = byte_order;
        int_class->signedness = signedness;
@@ -103,9 +115,3 @@ struct type_class_bitfield *bitfield_type_new(const char *name,
        }
        return bitfield_class;
 }
-
-void bitfield_type_free(struct type_class_bitfield *bitfield_class)
-{
-       if (!bitfield_class->name)
-               g_free(bitfield_class);
-}