From: Alejandro Colomar <alx@kernel.org>
Date: Fri, 17 May 2024 12:05:31 +0000 (+0200)
Subject: src/useradd.c: set_defaults(): Fix order of clean-ups
X-Git-Tag: 4.15.2~31
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=f8fc6371f69930bbd5801284256e182ba35ced2a;p=thirdparty%2Fshadow.git

src/useradd.c: set_defaults(): Fix order of clean-ups

Resources should be freed in the inverse order of the allocation.
This refactor prepares for the following commits, which fix some leaks.

Reviewed-by: Iker Pedrosa <ipedrosa@redhat.com>
Signed-off-by: Alejandro Colomar <alx@kernel.org>
---

diff --git a/src/useradd.c b/src/useradd.c
index 88d8ab7f1..56a745594 100644
--- a/src/useradd.c
+++ b/src/useradd.c
@@ -745,10 +745,9 @@ static int set_defaults (void)
 	         def_create_mail_spool, def_log_init));
 	ret = 0;
     setdef_err:
-	free(new_file);
-	if (prefix[0]) {
+	if (prefix[0])
 		free(default_file);
-	}
+	free(new_file);
 
 	return ret;
 }