]> git.ipfire.org Git - thirdparty/systemd.git/commitdiff
sd-bus: initialize return values on success in sd_bus_message_read_array()
authorLennart Poettering <lennart@poettering.net>
Wed, 14 Oct 2020 14:35:55 +0000 (16:35 +0200)
committerLennart Poettering <lennart@poettering.net>
Wed, 14 Oct 2020 15:35:00 +0000 (17:35 +0200)
Fixes: #17346
src/libsystemd/sd-bus/bus-message.c

index 55e35cd902ee960e20bb13271aa69ce0e0df89c5..f966dda2294563ff5aca14e94a25454ab272ccc6 100644 (file)
@@ -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);