From: Yu Watanabe <watanabe.yu+github@gmail.com>
Date: Tue, 18 Mar 2025 16:33:09 +0000 (+0900)
Subject: sd-varlink: fix overwrite of loop count
X-Git-Tag: v258-rc1~1051^2~3
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=a65d2de6d163daae715aa2a05869dbe65d2a0f01;p=thirdparty%2Fsystemd.git

sd-varlink: fix overwrite of loop count

Fixes a bug introduced by 206504a594492f4b97259bbe345dde4e520df7dc (v255).
---

diff --git a/src/libsystemd/sd-varlink/sd-varlink.c b/src/libsystemd/sd-varlink/sd-varlink.c
index 222ccaac5d0..c910a41354b 100644
--- a/src/libsystemd/sd-varlink/sd-varlink.c
+++ b/src/libsystemd/sd-varlink/sd-varlink.c
@@ -3753,7 +3753,7 @@ _public_ int sd_varlink_server_add_connection_stdio(sd_varlink_server *s, sd_var
 
 _public_ int sd_varlink_server_listen_name(sd_varlink_server *s, const char *name) {
         _cleanup_strv_free_ char **names = NULL;
-        int r, n = 0;
+        int r, m, n = 0;
 
         assert_return(s, -EINVAL);
         assert_return(name, -EINVAL);
@@ -3764,11 +3764,11 @@ _public_ int sd_varlink_server_listen_name(sd_varlink_server *s, const char *nam
          * See https://varlink.org/#activation for the environment variables this is backed by and the
          * recommended "varlink" identifier in $LISTEN_FDNAMES. */
 
-        r = sd_listen_fds_with_names(/* unset_environment= */ false, &names);
-        if (r < 0)
-                return r;
+        m = sd_listen_fds_with_names(/* unset_environment= */ false, &names);
+        if (m < 0)
+                return m;
 
-        for (int i = 0; i < r; i++) {
+        for (int i = 0; i < m; i++) {
                 int b, fd;
                 socklen_t l = sizeof(b);