From: Lennart Poettering <lennart@poettering.net>
Date: Thu, 14 Jan 2021 14:01:55 +0000 (+0100)
Subject: systemctl: properly initialize return params in all success cases
X-Git-Tag: v248-rc1~346^2~2
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=d5427dd29796a1ea464ed95e5ed3f0a0941ce01a;p=thirdparty%2Fsystemd.git

systemctl: properly initialize return params in all success cases
---

diff --git a/src/systemctl/systemctl-util.c b/src/systemctl/systemctl-util.c
index 9713fce7af0..aff247a881b 100644
--- a/src/systemctl/systemctl-util.c
+++ b/src/systemctl/systemctl-util.c
@@ -477,7 +477,7 @@ int unit_find_paths(
                         return -ERFKILL;
                 if (streq(load_state, "not-found")) {
                         r = 0;
-                        goto not_found;
+                        goto finish;
                 }
                 if (!STR_IN_SET(load_state, "loaded", "bad-setting"))
                         return -EKEYREJECTED;
@@ -534,6 +534,7 @@ int unit_find_paths(
                 }
         }
 
+ finish:
         if (isempty(path)) {
                 *ret_fragment_path = NULL;
                 r = 0;
@@ -550,7 +551,6 @@ int unit_find_paths(
                         *ret_dropin_paths = NULL;
         }
 
- not_found:
         if (r == 0 && !arg_force)
                 log_error("No files found for %s.", unit_name);