From: Lennart Poettering <lennart@poettering.net>
Date: Wed, 14 Oct 2020 14:35:55 +0000 (+0200)
Subject: sd-bus: initialize return values on success in sd_bus_message_read_array()
X-Git-Tag: v247-rc1~74^2~1
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=6293d958a4e12269261a7b68441b1c5be71d1f02;p=thirdparty%2Fsystemd.git

sd-bus: initialize return values on success in sd_bus_message_read_array()

Fixes: #17346
---

diff --git a/src/libsystemd/sd-bus/bus-message.c b/src/libsystemd/sd-bus/bus-message.c
index 55e35cd902e..f966dda2294 100644
--- a/src/libsystemd/sd-bus/bus-message.c
+++ b/src/libsystemd/sd-bus/bus-message.c
@@ -4795,8 +4795,13 @@ _public_ int sd_bus_message_read_array(
         assert_return(!BUS_MESSAGE_NEED_BSWAP(m), -EOPNOTSUPP);
 
         r = sd_bus_message_enter_container(m, SD_BUS_TYPE_ARRAY, CHAR_TO_STR(type));
-        if (r <= 0)
+        if (r < 0)
                 return r;
+        if (r == 0) {
+                *ptr = NULL;
+                *size = 0;
+                return 0;
+        }
 
         c = message_get_last_container(m);