Fix type free memleak

[babeltrace.git] / types / bitfield.c

diff --git a/types/bitfield.c b/types/bitfield.c
index e9a9f69662e31ab53af56d051e0426cb9dbe0fd9..a7111b1c454f81a293e4a1dc1244bdd7e0db814a 100644 (file)
--- a/types/bitfield.c
+++ b/types/bitfield.c
@@ -19,6 +19,7 @@
  */
 
 #include <babeltrace/compiler.h>
  */
 
 #include <babeltrace/compiler.h>

+#include <babeltrace/types.h>

 #include <stdint.h>
 
 /*
 #include <stdint.h>
 
 /*


@@ -73,27 +74,44 @@ size_t bitfield_copy(unsigned char *dest, const struct format *fdest,
        }
 }
 
        }
 }
 

-int bitfield_type_new(const char *name, size_t start_offset,
-                     size_t len, int byte_order, int signedness)
+void bitfield_type_free(struct type_class_bitfield *bitfield_class)

 {
 {

-       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,
+                                             int signedness,
+                                             size_t alignment)
+{
+       struct type_class_bitfield *bitfield_class;

        struct type_class_integer *int_class;
        int ret;
 
        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);
        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;
        bitfield_class->start_offset = start_offset;
        int_class->len = len;
        int_class->byte_order = byte_order;
        int_class->signedness = signedness;
        bitfield_class->start_offset = start_offset;

-       ret = ctf_register_type(&int_class->p);
-       if (ret)
-               g_free(bitfield_class);
-       return ret;
+       if (int_class->p.name) {
+               ret = ctf_register_type(&int_class->p);
+               if (ret) {
+                       g_free(bitfield_class);
+                       return NULL;
+               }
+       }
+       return bitfield_class;

 }
 }

-
-/* TODO: bitfield_type_free */