From 30da99bd3014eb805f85da415a9045e1e08d48ca Mon Sep 17 00:00:00 2001 From: Yu Watanabe Date: Fri, 27 May 2022 11:23:46 +0900 Subject: [PATCH] sd-bus: drop redundant condition By the previous commit, ALIGN8() is always equal to or greater than the argument. --- src/libsystemd/sd-bus/bus-message.c | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) 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; } -- 2.47.3