From: Yu Watanabe <watanabe.yu+github@gmail.com>
Date: Thu, 24 Nov 2022 17:34:57 +0000 (+0900)
Subject: sd-netlink: always initialize return variable on success
X-Git-Tag: v253-rc1~431^2~13
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=027193db48e6d2a17e6b483387ee06299b8ab4d9;p=thirdparty%2Fsystemd.git

sd-netlink: always initialize return variable on success
---

diff --git a/src/libsystemd/sd-netlink/netlink-socket.c b/src/libsystemd/sd-netlink/netlink-socket.c
index 1da459c0148..b5ed533db69 100644
--- a/src/libsystemd/sd-netlink/netlink-socket.c
+++ b/src/libsystemd/sd-netlink/netlink-socket.c
@@ -200,8 +200,11 @@ static int socket_recv_message(int fd, struct iovec *iov, uint32_t *ret_mcast_gr
         if (n < 0) {
                 if (n == -ENOBUFS)
                         return log_debug_errno(n, "sd-netlink: kernel receive buffer overrun");
-                if (ERRNO_IS_TRANSIENT(n))
+                if (ERRNO_IS_TRANSIENT(n)) {
+                        if (ret_mcast_group)
+                                *ret_mcast_group = 0;
                         return 0;
+                }
                 return (int) n;
         }
 
@@ -216,6 +219,8 @@ static int socket_recv_message(int fd, struct iovec *iov, uint32_t *ret_mcast_gr
                                 return (int) n;
                 }
 
+                if (ret_mcast_group)
+                        *ret_mcast_group = 0;
                 return 0;
         }
 
@@ -242,7 +247,7 @@ int socket_read_message(sd_netlink *nl) {
         bool multi_part = false, done = false;
         size_t len, allocated;
         struct iovec iov = {};
-        uint32_t group = 0;
+        uint32_t group;
         unsigned i = 0;
         int r;