From: Yu Watanabe <watanabe.yu+github@gmail.com>
Date: Fri, 27 May 2022 02:23:46 +0000 (+0900)
Subject: sd-bus: drop redundant condition
X-Git-Tag: v252-rc1~891^2~6
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=30da99bd3014eb805f85da415a9045e1e08d48ca;p=thirdparty%2Fsystemd.git

sd-bus: drop redundant condition

By the previous commit, ALIGN8() is always equal to or greater than the
argument.
---

diff --git a/src/libsystemd/sd-bus/bus-message.c b/src/libsystemd/sd-bus/bus-message.c
index 026ec101e3a..59659ef5b7e 100644
--- a/src/libsystemd/sd-bus/bus-message.c
+++ b/src/libsystemd/sd-bus/bus-message.c
@@ -507,8 +507,7 @@ int bus_message_from_header(
                 m->body_size = BUS_MESSAGE_BSWAP32(m, h->dbus1.body_size);
 
                 assert(message_size >= sizeof(struct bus_header));
-                if (m->fields_size > message_size - sizeof(struct bus_header) ||
-                    ALIGN8(m->fields_size) > message_size - sizeof(struct bus_header) ||
+                if (ALIGN8(m->fields_size) > message_size - sizeof(struct bus_header) ||
                     m->body_size != message_size - sizeof(struct bus_header) - ALIGN8(m->fields_size))
                         return -EBADMSG;
         }