shaba/systemd
1
0
Fork 0
mirror of https://github.com/systemd/systemd.git synced 2024-12-25 01:34:28 +03:00
Code

sd-journal: copy boot ID

Browse Source 
The pointer to boot ID may be invalidate by journal_file_move_to_object()
calls in the later loop.
This commit is contained in:
Yu Watanabe 2023-04-26 20:37:00 +09:00
parent 265b1dc048
commit bf9b7728e6
1 changed files with 3 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
src/libsystemd/sd-journal/journal-file.c
View File

@ -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,