execute: use _cleanup_ logic where appropriate

(cherry picked from commit 46e5bbab5895b7137b03453dee08bd1c89c710e9)

diff --git a/src/core/execute.c b/src/core/execute.c
index 94225c4cce2c20e5b5b662f42b399b2fdc5c756f..aefae6b7c55f7a6073f68b6868962ad3d66d5bcd 100644 (file)
--- a/src/core/execute.c
+++ b/src/core/execute.c
@@ -1182,10 +1182,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;
@@ -1382,9 +1383,7 @@ fail:
                 (void) pam_end(handle, pam_code | flags);
         }
 
-        strv_free(e);
         closelog();
-
         return r;
 #else
         return 0;