shaba/systemd
1
0
Fork 0
mirror of https://github.com/systemd/systemd.git synced 2024-10-30 14:55:37 +03:00
Code

sd-journal: re-read object from cache

Browse Source 
Fixes a bug introduced by 0e35afff1d.

Replaces 3388a4b582.
This commit is contained in:
Yu Watanabe 2022-10-12 15:59:43 +09:00
parent d31542e5ac
commit b596d06c38
1 changed files with 6 additions and 0 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

@ -4026,6 +4026,12 @@ int journal_file_copy_entry(JournalFile *from, JournalFile *to, Object *o, uint6
.object_offset = h,
.hash = le64toh(u->data.hash),
};
/* The above journal_file_data_payload() may clear or overwrite cached object. Hence, we need
* to re-read the object from the cache. */
r = journal_file_move_to_object(from, OBJECT_ENTRY, p, &o);
if (r < 0)
return r;
}
r = journal_file_append_entry_internal(to, &ts, boot_id, xor_hash, items, n, NULL, NULL, NULL);