Fix: avoid double-free in build_index_from_idx_file

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

diff --git a/src/plugins/ctf/fs-src/data-stream-file.c b/src/plugins/ctf/fs-src/data-stream-file.c
index 352efa89711facfff163105bb4f601c0d631a217..5f811214f917634a980854e1dd2cf3fe1f14adbc 100644 (file)
--- a/src/plugins/ctf/fs-src/data-stream-file.c
+++ b/src/plugins/ctf/fs-src/data-stream-file.c
@@ -251,7 +251,7 @@ enum bt_msg_iter_medium_status medop_seek(enum bt_msg_iter_seek_whence whence,
 
 map_requested_offset:
        offset_in_mapping = offset %
-               bt_common_get_page_size(ds_file->log_level);
+               bt_mmap_get_offset_align_size(ds_file->log_level);
 
        ds_file->mmap_offset = offset - offset_in_mapping;
        ds_file->request_offset = offset_in_mapping;
@@ -448,8 +448,11 @@ struct ctf_fs_ds_index *build_index_from_idx_file(
                total_packets_size += packet_size;
                file_pos += file_index_entry_size;
 
-               g_ptr_array_add(index->entries, index_entry);
                prev_index_entry = index_entry;
+
+               /* Give ownership of `index_entry` to `index->entries`. */
+               g_ptr_array_add(index->entries, index_entry);
+               index_entry = NULL;
        }
 
        /* Validate that the index addresses the complete stream. */
@@ -495,6 +498,8 @@ int init_index_entry(struct ctf_fs_ds_index_entry *entry,
        entry->packet_size = packet_size;
 
        if (props->snapshots.beginning_clock != UINT64_C(-1)) {
+               entry->timestamp_begin = props->snapshots.beginning_clock;
+
                /* Convert the packet's bound to nanoseconds since Epoch. */
                ret = convert_cycles_to_ns(sc->default_clock_class,
                                           props->snapshots.beginning_clock,
@@ -504,10 +509,14 @@ int init_index_entry(struct ctf_fs_ds_index_entry *entry,
                        goto end;
                }
        } else {
+               entry->timestamp_begin = UINT64_C(-1);
                entry->timestamp_begin_ns = UINT64_C(-1);
        }
 
        if (props->snapshots.end_clock != UINT64_C(-1)) {
+               entry->timestamp_end = props->snapshots.end_clock;
+
+               /* Convert the packet's bound to nanoseconds since Epoch. */
                ret = convert_cycles_to_ns(sc->default_clock_class,
                                           props->snapshots.end_clock,
                                           &entry->timestamp_end_ns);
@@ -516,6 +525,7 @@ int init_index_entry(struct ctf_fs_ds_index_entry *entry,
                        goto end;
                }
        } else {
+               entry->timestamp_end = UINT64_C(-1);
                entry->timestamp_end_ns = UINT64_C(-1);
        }
 
@@ -540,7 +550,7 @@ struct ctf_fs_ds_index *build_index_from_stream_file(
                goto error;
        }
 
-       do {
+       while (true) {
                off_t current_packet_size_bytes;
                struct ctf_fs_ds_index_entry *index_entry;
                struct bt_msg_iter_packet_properties props;
@@ -610,11 +620,6 @@ struct ctf_fs_ds_index *build_index_from_stream_file(
                        "next-packet-offset=%jd",
                        (intmax_t) (current_packet_offset_bytes - current_packet_size_bytes),
                        (intmax_t) current_packet_offset_bytes);
-
-       } while (iter_status == BT_MSG_ITER_STATUS_OK);
-
-       if (iter_status != BT_MSG_ITER_STATUS_OK) {
-               goto error;
        }
 
 end:
@@ -635,7 +640,7 @@ struct ctf_fs_ds_file *ctf_fs_ds_file_create(
                bt_logging_level log_level)
 {
        int ret;
-       const size_t page_size = bt_common_get_page_size(log_level);
+       const size_t offset_align = bt_mmap_get_offset_align_size(log_level);
        struct ctf_fs_ds_file *ds_file = g_new0(struct ctf_fs_ds_file, 1);
 
        if (!ds_file) {
@@ -665,7 +670,7 @@ struct ctf_fs_ds_file *ctf_fs_ds_file_create(
                goto error;
        }
 
-       ds_file->mmap_max_len = page_size * 2048;
+       ds_file->mmap_max_len = offset_align * 2048;
 
        goto end;