Version 1.0.0-rc6

[babeltrace.git] / types / sequence.c

diff --git a/types/sequence.c b/types/sequence.c
index ed719bc5d553ef3b34d5125c38dcd771076ec1a9..81270facd1096bc26fa25829fdbea505c42f0f19 100644 (file)
--- a/types/sequence.c
+++ b/types/sequence.c
@@ -20,6 +20,7 @@
 
 #include <babeltrace/compiler.h>
 #include <babeltrace/format.h>
+#include <babeltrace/types.h>
 #include <inttypes.h>
 
 static
@@ -59,13 +60,18 @@ int sequence_rw(struct stream_pos *pos, struct definition *definition)
 
                str = g_string_new("");
                g_string_printf(str, "[%" PRIu64 "]", i);
-               (void) g_string_free(str, TRUE);
                name = g_quark_from_string(str->str);
+               (void) g_string_free(str, TRUE);
 
                field = (struct definition **) &g_ptr_array_index(sequence_definition->elems, i);
                *field = sequence_declaration->elem->definition_new(sequence_declaration->elem,
                                          sequence_definition->p.scope,
                                          name, i, NULL);
+       }
+       for (i = 0; i < len; i++) {
+               struct definition **field;
+
+               field = (struct definition **) &g_ptr_array_index(sequence_definition->elems, i);
                ret = generic_rw(pos, *field);
                if (ret)
                        return ret;
@@ -200,8 +206,8 @@ void _sequence_definition_free(struct definition *definition)
                        field = g_ptr_array_index(sequence->elems, i);
                        field->declaration->definition_free(field);
                }
+               (void) g_ptr_array_free(sequence->elems, TRUE);
        }
-       (void) g_ptr_array_free(sequence->elems, TRUE);
        definition_unref(len_definition);
        free_definition_scope(sequence->p.scope);
        declaration_unref(sequence->p.declaration);