Fix: src.ctf.fs: free ds_file_info when add_ds_file_to_ds_file_group fails

[babeltrace.git] / src / plugins / ctf / fs-src / fs.c

diff --git a/src/plugins/ctf/fs-src/fs.c b/src/plugins/ctf/fs-src/fs.c
index 1f4ea64b920d7761aa8fd69b5e10bf96ce4b287a..28e2b8119cf79b0e88f19d7976426b1a37ff8b2b 100644 (file)
--- a/src/plugins/ctf/fs-src/fs.c
+++ b/src/plugins/ctf/fs-src/fs.c
@@ -118,7 +118,7 @@ bt_component_class_message_iterator_next_method_status ctf_fs_iterator_next_one(
 {
        bt_component_class_message_iterator_next_method_status status;
 
-       BT_ASSERT(msg_iter_data->ds_file);
+       BT_ASSERT_DBG(msg_iter_data->ds_file);
 
        while (true) {
                bt_message *msg;
@@ -678,23 +678,42 @@ void ds_file_group_insert_ds_file_info_sorted(
 }
 
 static
-void ds_file_group_insert_ds_index_entry_sorted(
-       struct ctf_fs_ds_file_group *ds_file_group,
+void ds_index_insert_ds_index_entry_sorted(
+       struct ctf_fs_ds_index *index,
        struct ctf_fs_ds_index_entry *entry)
 {
        guint i;
 
        /* Find the spot where to insert this index entry. */
-       for (i = 0; i < ds_file_group->index->entries->len; i++) {
-               struct ctf_fs_ds_index_entry *other_entry = g_ptr_array_index(
-                       ds_file_group->index->entries, i);
+       for (i = 0; i < index->entries->len; i++) {
+               struct ctf_fs_ds_index_entry *other_entry =
+                       g_ptr_array_index(index->entries, i);
 
                if (entry->timestamp_begin_ns < other_entry->timestamp_begin_ns) {
                        break;
                }
        }
 
-       array_insert(ds_file_group->index->entries, entry, i);
+       array_insert(index->entries, entry, i);
+}
+
+static
+void merge_ctf_fs_ds_indexes(struct ctf_fs_ds_index *dest, struct ctf_fs_ds_index *src)
+{
+       guint i;
+
+       for (i = 0; i < src->entries->len; i++) {
+               struct ctf_fs_ds_index_entry *entry =
+                       g_ptr_array_index(src->entries, i);
+
+               /*
+               * Ownership of the ctf_fs_ds_index_entry is transferred to
+               * dest.
+               */
+               g_ptr_array_index(src->entries, i) = NULL;
+
+               ds_index_insert_ds_index_entry_sorted(dest, entry);
+       }
 }
 
 static
@@ -766,8 +785,11 @@ int add_ds_file_to_ds_file_group(struct ctf_fs_trace *ctf_fs_trace,
 
        index = ctf_fs_ds_file_build_index(ds_file, ds_file_info);
        if (!index) {
-               BT_COMP_LOGW("Failed to index CTF stream file \'%s\'",
+               BT_COMP_OR_COMP_CLASS_LOGE_APPEND_CAUSE(
+                       self_comp, self_comp_class,
+                       "Failed to index CTF stream file \'%s\'",
                        ds_file->file->path->str);
+               goto error;
        }
 
        if (begin_ns == -1) {
@@ -796,7 +818,8 @@ int add_ds_file_to_ds_file_group(struct ctf_fs_trace *ctf_fs_trace,
                        goto error;
                }
 
-               ds_file_group_insert_ds_file_info_sorted(ds_file_group, ds_file_info);
+               ds_file_group_insert_ds_file_info_sorted(ds_file_group,
+                       BT_MOVE_REF(ds_file_info));
 
                add_group = true;
                goto end;
@@ -829,9 +852,12 @@ int add_ds_file_to_ds_file_group(struct ctf_fs_trace *ctf_fs_trace,
                }
 
                add_group = true;
+       } else {
+               merge_ctf_fs_ds_indexes(ds_file_group->index, index);
        }
 
-       ds_file_group_insert_ds_file_info_sorted(ds_file_group, ds_file_info);
+       ds_file_group_insert_ds_file_info_sorted(ds_file_group,
+               BT_MOVE_REF(ds_file_info));
 
        goto end;
 
@@ -846,6 +872,7 @@ end:
        }
 
        ctf_fs_ds_file_destroy(ds_file);
+       ctf_fs_ds_file_info_destroy(ds_file_info);
 
        if (msg_iter) {
                bt_msg_iter_destroy(msg_iter);
@@ -1226,18 +1253,7 @@ void merge_ctf_fs_ds_file_groups(struct ctf_fs_ds_file_group *dest, struct ctf_f
        }
 
        /* Merge both indexes. */
-       for (i = 0; i < src->index->entries->len; i++) {
-               struct ctf_fs_ds_index_entry *entry = g_ptr_array_index(
-                       src->index->entries, i);
-
-               /*
-                * Ownership of the ctf_fs_ds_index_entry is transferred to
-                * dest.
-                */
-               g_ptr_array_index(src->index->entries, i) = NULL;
-
-               ds_file_group_insert_ds_index_entry_sorted(dest, entry);
-       }
+       merge_ctf_fs_ds_indexes(dest->index, src->index);
 }
 /* Merge src_trace's data stream file groups into dest_trace's. */