delete Assertion o->object.type == OBJECT_ENTRY_ARRAY from the bump_entry_array

delete-Assertion-o-object.type-OBJECT_ENTRY_ARRAY.patch

@@ -0,0 +1,27 @@
+From e69a0842d76e0c4f2d14a9a82a3397a20fbaf999 Mon Sep 17 00:00:00 2001
+From: huyubiao <huyubiao@huawei.com>
+Date: Fri, 27 Dec 2024 15:27:31 +0800
+Subject: [PATCH] delete Assertion 'o->object.type == OBJECT_ENTRY_ARRAY'
+
+---
+ src/libsystemd/sd-journal/journal-file.c | 4 +++-
+ 1 file changed, 3 insertions(+), 1 deletion(-)
+
+diff --git a/src/libsystemd/sd-journal/journal-file.c b/src/libsystemd/sd-journal/journal-file.c
+index 090d506..38d2a85 100644
+--- a/src/libsystemd/sd-journal/journal-file.c
++++ b/src/libsystemd/sd-journal/journal-file.c
+@@ -2724,7 +2724,9 @@ static int bump_entry_array(
+ 
+         if (direction == DIRECTION_DOWN) {
+                 assert(o);
+-                assert(o->object.type == OBJECT_ENTRY_ARRAY);
++                if (o->object.type != OBJECT_ENTRY_ARRAY) {
++                    return -EBADMSG;
++                }
+ 
+                 *ret = le64toh(o->entry_array.next_entry_array_offset);
+         } else {
+-- 
+2.33.0
+

systemd.spec

@@ -25,7 +25,7 @@
 Name:           systemd
 Url:            https://systemd.io/
 Version:        255
-Release:        36
+Release:        37
 License:        MIT and LGPLv2+ and GPLv2+
 Summary:        System and Service Manager
 
@@ -150,6 +150,7 @@ Patch9057:      add-a-new-switch-to-control-whether-udev-complies-wi.patch
 Patch9058:      journal-don-t-enable-systemd-journald-audit.socket.patch
 Patch9059:      systemd-fstab-generator-print-logs-only-to-kmsg.patch
 Patch9060:      systemd-logind-add-log-to-display-devices.patch
+Patch9061:      delete-Assertion-o-object.type-OBJECT_ENTRY_ARRAY.patch
 
 Patch9801:      Systemd-Add-sw64-architecture.patch
 Patch9802:      backport-repart-fix-memory-leak.patch
@@ -1690,6 +1691,9 @@ fi
 %{_unitdir}/veritysetup.target
 
 %changelog
+* Thu Jan 9 2025 huyubiao <huyubiao@huawei.com> - 255-37
+- delete Assertion o->object.type == OBJECT_ENTRY_ARRAY from the bump_entry_array
+
 * Tue Dec 31 2024 fuanan <fuanan3@h-partners.com> - 255-36
 - systemd-logind button_dispatch add log to display devices that triggered the button