From bf9b7728e6e8eb185d2c9bfc6641077489384bc8 Mon Sep 17 00:00:00 2001 From: Yu Watanabe Date: Wed, 26 Apr 2023 20:37:00 +0900 Subject: sd-journal: copy boot ID The pointer to boot ID may be invalidate by journal_file_move_to_object() calls in the later loop. --- src/libsystemd/sd-journal/journal-file.c | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) (limited to 'src/libsystemd') diff --git a/src/libsystemd/sd-journal/journal-file.c b/src/libsystemd/sd-journal/journal-file.c index f14e7aa23d..e9bb893ca8 100644 --- a/src/libsystemd/sd-journal/journal-file.c +++ b/src/libsystemd/sd-journal/journal-file.c @@ -4169,7 +4169,7 @@ int journal_file_copy_entry( _cleanup_free_ EntryItem *items_alloc = NULL; EntryItem *items; uint64_t n, m = 0, xor_hash = 0; - const sd_id128_t *boot_id; + sd_id128_t boot_id; dual_timestamp ts; int r; @@ -4185,7 +4185,7 @@ int journal_file_copy_entry( .monotonic = le64toh(o->entry.monotonic), .realtime = le64toh(o->entry.realtime), }; - boot_id = &o->entry.boot_id; + boot_id = o->entry.boot_id; n = journal_file_entry_n_items(from, o); @@ -4246,7 +4246,7 @@ int journal_file_copy_entry( r = journal_file_append_entry_internal( to, &ts, - boot_id, + &boot_id, &from->header->machine_id, xor_hash, items, -- cgit v1.2.1