From: Lennart Poettering <lennart@poettering.net>
Date: Tue, 1 Feb 2022 12:49:56 +0000 (+0100)
Subject: execute: use _cleanup_ logic where appropriate
X-Git-Tag: v251-rc1~392^2~2
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=46e5bbab5895b7137b03453dee08bd1c89c710e9;p=thirdparty%2Fsystemd.git

execute: use _cleanup_ logic where appropriate
---

diff --git a/src/core/execute.c b/src/core/execute.c
index be2116e0eca..74dea32a509 100644
--- a/src/core/execute.c
+++ b/src/core/execute.c
@@ -1183,10 +1183,11 @@ static int setup_pam(
         };
 
         _cleanup_(barrier_destroy) Barrier barrier = BARRIER_NULL;
+        _cleanup_strv_free_ char **e = NULL;
         pam_handle_t *handle = NULL;
         sigset_t old_ss;
         int pam_code = PAM_SUCCESS, r;
-        char **nv, **e = NULL;
+        char **nv;
         bool close_session = false;
         pid_t pam_pid = 0, parent_pid;
         int flags = 0;
@@ -1383,9 +1384,7 @@ fail:
                 (void) pam_end(handle, pam_code | flags);
         }
 
-        strv_free(e);
         closelog();
-
         return r;
 #else
         return 0;