From: Yu Watanabe <watanabe.yu+github@gmail.com>
Date: Fri, 16 May 2025 17:25:36 +0000 (+0900)
Subject: sd-journal: variable sized array cannot be used in ObjectHeader
X-Git-Tag: v258-rc1~365^2~5
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=462d287bc9edc395d65503ee0ce24277304ef932;p=thirdparty%2Fsystemd.git

sd-journal: variable sized array cannot be used in ObjectHeader

The struct ObjectHeader is embedded in real object structs.
Hence, the existence of the flex array in ObjectHeader violates the
requirement that flex array must be at the end of struct.
---

diff --git a/src/libsystemd/sd-journal/journal-def.h b/src/libsystemd/sd-journal/journal-def.h
index f3fef931d03..8cd0843197e 100644
--- a/src/libsystemd/sd-journal/journal-def.h
+++ b/src/libsystemd/sd-journal/journal-def.h
@@ -55,7 +55,8 @@ struct ObjectHeader {
         uint8_t flags;
         uint8_t reserved[6];
         le64_t size;
-        uint8_t payload[];
+        uint8_t payload[0]; /* The struct is embedded in other objects, hence flex array (i.e. payload[])
+                             * cannot be used. */
 } _packed_;
 
 #define DataObject__contents {                                          \