From: Daan De Meyer <daan.j.demeyer@gmail.com>
Date: Thu, 16 Oct 2025 07:32:44 +0000 (+0200)
Subject: core: Make sure we don't clobber return argument on failure
X-Git-Tag: v259-rc1~317
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=73623f198442408d7f920729f5056b7a2c9cff79;p=thirdparty%2Fsystemd.git

core: Make sure we don't clobber return argument on failure

As documented in the coding style, let's make sure we follow it.
---

diff --git a/src/core/varlink-common.c b/src/core/varlink-common.c
index eb3fafa2fa9..6a1e6af9ae9 100644
--- a/src/core/varlink-common.c
+++ b/src/core/varlink-common.c
@@ -36,6 +36,7 @@ int rlimit_build_json(sd_json_variant **ret, const char *name, void *userdata) {
 }
 
 int rlimit_table_build_json(sd_json_variant **ret, const char *name, void *userdata) {
+        _cleanup_(sd_json_variant_unrefp) sd_json_variant *v = NULL;
         struct rlimit **rl = ASSERT_PTR(userdata);
         int r;
 
@@ -43,11 +44,13 @@ int rlimit_table_build_json(sd_json_variant **ret, const char *name, void *userd
 
         for (int i = 0; i < _RLIMIT_MAX; i++) {
                 r = sd_json_variant_merge_objectbo(
-                        ret,
+                        &v,
                         JSON_BUILD_PAIR_CALLBACK_NON_NULL(rlimit_to_string(i), rlimit_build_json, rl[i]));
                 if (r < 0)
                         return r;
         }
 
+        *ret = TAKE_PTR(v);
+
         return 0;
 }