]> git.ipfire.org Git - thirdparty/systemd.git/commitdiff
sd-bus: drop redundant condition
authorYu Watanabe <watanabe.yu+github@gmail.com>
Fri, 27 May 2022 02:23:46 +0000 (11:23 +0900)
committerYu Watanabe <watanabe.yu+github@gmail.com>
Tue, 31 May 2022 18:41:15 +0000 (03:41 +0900)
By the previous commit, ALIGN8() is always equal to or greater than the
argument.

src/libsystemd/sd-bus/bus-message.c

index 026ec101e3a5ff5633aa68465c989be27e759444..59659ef5b7e5474a523b9b9af8da155430b1a9b5 100644 (file)
@@ -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;
         }