You can not select more than 25 topics
Topics must start with a letter or number, can include dashes ('-') and can be up to 35 characters long.
27 lines
1.0 KiB
27 lines
1.0 KiB
2 years ago
|
From acf4f21936ad6153ba53f2d798967e57473be8bc Mon Sep 17 00:00:00 2001
|
||
|
|
From: Daan De Meyer <daan.j.demeyer@gmail.com>
|
||
|
|
Date: Thu, 23 Feb 2023 15:40:38 +0100
|
||
|
|
Subject: [PATCH] journal-file: Fix return value in bump_entry_array()
|
||
|
|
|
||
|
|
(cherry picked from commit 0399902440fbaea5b163254f70be57dbedb7131e)
|
||
|
|
|
||
|
|
Resolves: #2173682
|
||
|
|
---
|
||
|
|
src/libsystemd/sd-journal/journal-file.c | 3 ++-
|
||
|
|
1 file changed, 2 insertions(+), 1 deletion(-)
|
||
|
|
|
||
|
|
diff --git a/src/libsystemd/sd-journal/journal-file.c b/src/libsystemd/sd-journal/journal-file.c
|
||
|
|
index c1ec6bb1d8..c489436a1e 100644
|
||
|
|
--- a/src/libsystemd/sd-journal/journal-file.c
|
||
|
|
+++ b/src/libsystemd/sd-journal/journal-file.c
|
||
|
|
@@ -2410,7 +2410,8 @@ static int bump_entry_array(
|
||
|
|
|
||
|
|
if (direction == DIRECTION_DOWN) {
|
||
|
|
assert(o);
|
||
|
|
- return le64toh(o->entry_array.next_entry_array_offset);
|
||
|
|
+ *ret = le64toh(o->entry_array.next_entry_array_offset);
|
||
|
|
+ return 0;
|
||
|
|
}
|
||
|
|
|
||
|
|
/* Entry array chains are a singly linked list, so to find the previous array in the chain, we have
|