From: Alejandro Colomar <alx@kernel.org>
Date: Wed, 1 Jan 2025 13:02:08 +0000 (+0100)
Subject: lib/, src/: Use aprintf() instead of asprintf(3)
X-Git-Tag: 4.18.0-rc1~23
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=86303b12338355d7eae098ab2e962b859d606c93;p=thirdparty%2Fshadow.git

lib/, src/: Use aprintf() instead of asprintf(3)

Signed-off-by: Alejandro Colomar <alx@kernel.org>
---

diff --git a/lib/commonio.c b/lib/commonio.c
index 38bf65c59..7304ec006 100644
--- a/lib/commonio.c
+++ b/lib/commonio.c
@@ -35,6 +35,7 @@
 #include "shadowlog_internal.h"
 #include "sssd.h"
 #include "string/memset/memzero.h"
+#include "string/sprintf/aprintf.h"
 #include "string/sprintf/snprintf.h"
 #include "string/strcmp/streq.h"
 #include "string/strcmp/strprefix.h"
@@ -361,9 +362,12 @@ int commonio_lock_nowait (struct commonio_db *db, bool log)
 		return 1;
 	}
 
-	if (asprintf(&file, "%s.%ju", db->filename, (uintmax_t) getpid()) == -1)
+	file = aprintf("%s.%ju", db->filename, (uintmax_t) getpid());
+	if (file == NULL)
 		goto cleanup_ENOMEM;
-	if (asprintf(&lock, "%s.lock", db->filename) == -1)
+
+	lock = aprintf("%s.lock", db->filename);
+	if (lock == NULL)
 		goto cleanup_ENOMEM;
 
 	if (do_lock_file (file, lock, log) != 0) {
diff --git a/lib/copydir.c b/lib/copydir.c
index 3a6c132b5..9dbe6fd6f 100644
--- a/lib/copydir.c
+++ b/lib/copydir.c
@@ -38,6 +38,7 @@
 #include <attr/libattr.h>
 #endif				/* WITH_ATTR */
 #include "shadowlog.h"
+#include "string/sprintf/aprintf.h"
 #include "string/sprintf/xasprintf.h"
 #include "string/strcmp/streq.h"
 #include "string/strcmp/strprefix.h"
@@ -322,13 +323,13 @@ static int copy_tree_impl (const struct path_info *src, const struct path_info *
 			continue;
 		}
 
-		if (asprintf(&src_name, "%s/%s", src->full_path, ent->d_name) == -1)
-		{
+		src_name = aprintf("%s/%s", src->full_path, ent->d_name);
+		if (src_name == NULL) {
 			err = -1;
 			continue;
 		}
-		if (asprintf(&dst_name, "%s/%s", dst->full_path, ent->d_name) == -1)
-		{
+		dst_name = aprintf("%s/%s", dst->full_path, ent->d_name);
+		if (dst_name == NULL) {
 			err = -1;
 			goto skip;
 		}
diff --git a/lib/groupio.c b/lib/groupio.c
index a4348a1c7..72391433b 100644
--- a/lib/groupio.c
+++ b/lib/groupio.c
@@ -23,6 +23,7 @@
 #include "getdef.h"
 #include "groupio.h"
 #include "prototypes.h"
+#include "string/sprintf/aprintf.h"
 #include "string/strcmp/streq.h"
 
 
@@ -325,7 +326,8 @@ static /*@null@*/struct commonio_entry *merge_group_entries (
 	}
 
 	/* Concatenate the 2 lines */
-	if (asprintf(&new_line, "%s\n%s", gr1->line, gr2->line) == -1)
+	new_line = aprintf("%s\n%s", gr1->line, gr2->line);
+	if (new_line == NULL)
 		return NULL;
 
 	/* Concatenate the 2 list of members */
diff --git a/lib/run_part.c b/lib/run_part.c
index 890f837cd..745dd354e 100644
--- a/lib/run_part.c
+++ b/lib/run_part.c
@@ -13,6 +13,7 @@
 
 #include "run_part.h"
 #include "shadowlog_internal.h"
+#include "string/sprintf/aprintf.h"
 
 
 static int run_part(char *script_path, const char *name, const char *action)
@@ -60,8 +61,9 @@ int run_parts(const char *directory, const char *name, const char *action)
 		char         *s;
 		struct stat  sb;
 
-		if (asprintf(&s, "%s/%s", directory, namelist[n]->d_name) == -1) {
-			fprintf(shadow_logfd, "asprintf: %s\n", strerror(errno));
+		s = aprintf("%s/%s", directory, namelist[n]->d_name);
+		if (s == NULL) {
+			fprintf(shadow_logfd, "aprintf: %s\n", strerror(errno));
 			for (; n<scanlist; n++) {
 				free(namelist[n]);
 			}
diff --git a/lib/tcbfuncs.c b/lib/tcbfuncs.c
index 8ac1b563c..e40c5eeac 100644
--- a/lib/tcbfuncs.c
+++ b/lib/tcbfuncs.c
@@ -24,6 +24,7 @@
 #include "tcbfuncs.h"
 #include "shadowio.h"
 #include "shadowlog_internal.h"
+#include "string/sprintf/aprintf.h"
 #include "string/strcmp/streq.h"
 
 
@@ -71,21 +72,23 @@ static /*@null@*/ char *shadowtcb_path_rel (const char *name, uid_t uid)
 	char *ret;
 
 	if (!getdef_bool ("TCB_SYMLINKS") || uid < SHADOWTCB_HASH_BY) {
-		if (asprintf (&ret, "%s", name) == -1) {
+		ret = aprintf("%s", name);
+		if (ret == NULL) {
 			OUT_OF_MEMORY;
 			return NULL;
 		}
 	} else if (uid < SHADOWTCB_HASH_BY * SHADOWTCB_HASH_BY) {
-		if (asprintf (&ret, ":%dK/%s",
-		              uid / SHADOWTCB_HASH_BY, name) == -1) {
+		ret = aprintf(":%dK/%s", uid / SHADOWTCB_HASH_BY, name);
+		if (ret == NULL) {
 			OUT_OF_MEMORY;
 			return NULL;
 		}
 	} else {
-		if (asprintf (&ret, ":%dM/:%dK/%s",
+		ret = aprintf(":%dM/:%dK/%s",
 		              uid / (SHADOWTCB_HASH_BY * SHADOWTCB_HASH_BY),
 		              (uid % (SHADOWTCB_HASH_BY * SHADOWTCB_HASH_BY)) / SHADOWTCB_HASH_BY,
-			name) == -1) {
+		              name);
+		if (ret == NULL) {
 			OUT_OF_MEMORY;
 			return NULL;
 		}
@@ -99,7 +102,8 @@ static /*@null@*/ char *shadowtcb_path_rel_existing (const char *name)
 	struct stat st;
 	char link[8192];
 
-	if (asprintf (&path, TCB_DIR "/%s", name) == -1) {
+	path = aprintf(TCB_DIR "/%s", name);
+	if (path == NULL) {
 		OUT_OF_MEMORY;
 		return NULL;
 	}
@@ -150,7 +154,8 @@ static /*@null@*/ char *shadowtcb_path (const char *name, uid_t uid)
 	if (NULL == rel) {
 		return NULL;
 	}
-	if (asprintf (&ret, TCB_DIR "/%s", rel) == -1) {
+	ret = aprintf(TCB_DIR "/%s", rel);
+	if (ret == NULL) {
 		OUT_OF_MEMORY;
 		free (rel);
 		return NULL;
@@ -167,7 +172,8 @@ static /*@null@*/ char *shadowtcb_path_existing (const char *name)
 	if (NULL == rel) {
 		return NULL;
 	}
-	if (asprintf (&ret, TCB_DIR "/%s", rel) == -1) {
+	ret = aprintf(TCB_DIR "/%s", rel);
+	if (ret == NULL) {
 		OUT_OF_MEMORY;
 		free (rel);
 		return NULL;
@@ -193,7 +199,8 @@ static shadowtcb_status mkdir_leading (const char *name, uid_t uid)
 	}
 	while ((ind = strchr (ptr, '/'))) {
 		stpcpy(ind, "");
-		if (asprintf (&dir, TCB_DIR "/%s", path) == -1) {
+		dir = aprintf(TCB_DIR "/%s", path);
+		if (dir == NULL) {
 			OUT_OF_MEMORY;
 			return SHADOWTCB_FAILURE;
 		}
@@ -235,7 +242,8 @@ static shadowtcb_status unlink_suffs (const char *user)
 	int i;
 
 	for (i = 0; i < 3; i++) {
-		if (asprintf (&tmp, TCB_FMT "%s", user, suffs[i]) == -1) {
+		tmp = aprintf(TCB_FMT "%s", user, suffs[i]);
+		if (tmp == NULL) {
 			OUT_OF_MEMORY;
 			return SHADOWTCB_FAILURE;
 		}
@@ -259,7 +267,8 @@ static shadowtcb_status rmdir_leading (char *path)
 	shadowtcb_status ret = SHADOWTCB_SUCCESS;
 	while ((ind = strrchr (path, '/'))) {
 		stpcpy(ind, "");
-		if (asprintf (&dir, TCB_DIR "/%s", path) == -1) {
+		dir = aprintf(TCB_DIR "/%s", path);
+		if (dir == NULL) {
 			OUT_OF_MEMORY;
 			return SHADOWTCB_FAILURE;
 		}
@@ -290,7 +299,8 @@ static shadowtcb_status move_dir (const char *user_newname, uid_t user_newid)
 	if (NULL == stored_tcb_user) {
 		return SHADOWTCB_FAILURE;
 	}
-	if (asprintf (&olddir, TCB_DIR "/%s", stored_tcb_user) == -1) {
+	olddir = aprintf(TCB_DIR "/%s", stored_tcb_user);
+	if (olddir == NULL) {
 		goto out_free_nomem;
 	}
 	if (stat (olddir, &oldmode) != 0) {
@@ -335,7 +345,8 @@ static shadowtcb_status move_dir (const char *user_newname, uid_t user_newid)
 		         shadow_progname, olddir, strerror (errno));
 		goto out_free;
 	}
-	if (asprintf (&newdir, TCB_DIR "/%s", user_newname) == -1) {
+	newdir = aprintf(TCB_DIR "/%s", user_newname);
+	if (newdir == NULL) {
 		goto out_free_nomem;
 	}
 	real_new_dir_rel = shadowtcb_path_rel (user_newname, the_newid);
@@ -379,7 +390,8 @@ shadowtcb_status shadowtcb_set_user (const char* name)
 		OUT_OF_MEMORY;
 		return SHADOWTCB_FAILURE;
 	}
-	if (asprintf (&buf, TCB_FMT, name) == -1) {
+	buf = aprintf(TCB_FMT, name);
+	if (buf == NULL) {
 		OUT_OF_MEMORY;
 		return SHADOWTCB_FAILURE;
 	}
@@ -403,7 +415,8 @@ shadowtcb_status shadowtcb_remove (const char *name)
 	}
 	free (path);
 	free (rel);
-	if (asprintf (&path, TCB_DIR "/%s", name) == -1) {
+	path = aprintf(TCB_DIR "/%s", name);
+	if (path == NULL) {
 		OUT_OF_MEMORY;
 		return SHADOWTCB_FAILURE;
 	}
@@ -435,11 +448,13 @@ shadowtcb_status shadowtcb_move (/*@NULL@*/const char *user_newname, uid_t user_
 	if (-1 == user_newid) {
 		return SHADOWTCB_SUCCESS;
 	}
-	if (asprintf(&tcbdir, TCB_DIR "/%s", user_newname) == -1) {
+	tcbdir = aprintf(TCB_DIR "/%s", user_newname);
+	if (tcbdir == NULL) {
 		OUT_OF_MEMORY;
 		return SHADOWTCB_FAILURE;
 	}
-	if (asprintf(&shadow, TCB_FMT, user_newname) == -1) {
+	shadow = aprintf(TCB_FMT, user_newname);
+	if (shadow == NULL) {
 		OUT_OF_MEMORY;
 		return SHADOWTCB_FAILURE;
 	}
@@ -543,11 +558,13 @@ shadowtcb_status shadowtcb_create (const char *name, uid_t uid)
 		}
 	}
 
-	if (asprintf(&dir, TCB_DIR "/%s", name) == -1) {
+	dir = aprintf(TCB_DIR "/%s", name);
+	if (dir == NULL) {
 		OUT_OF_MEMORY;
 		return SHADOWTCB_FAILURE;
 	}
-	if (asprintf(&shadow, TCB_FMT, name) == -1) {
+	shadow = aprintf(TCB_FMT, name);
+	if (shadow == NULL) {
 		OUT_OF_MEMORY;
 		return SHADOWTCB_FAILURE;
 	}
diff --git a/src/useradd.c b/src/useradd.c
index ed1e0bc56..0821e03ee 100644
--- a/src/useradd.c
+++ b/src/useradd.c
@@ -66,6 +66,7 @@
 #include "shadowlog.h"
 #include "sssd.h"
 #include "string/memset/memzero.h"
+#include "string/sprintf/aprintf.h"
 #include "string/sprintf/snprintf.h"
 #include "string/sprintf/xasprintf.h"
 #include "string/strcmp/strcaseeq.h"
@@ -330,7 +331,8 @@ get_defaults(void)
 	const char  *ccp;
 
 	if (prefix[0]) {
-		if (asprintf(&default_file, "%s/%s", prefix, USER_DEFAULTS_FILE) == -1)
+		default_file = aprintf("%s/%s", prefix, USER_DEFAULTS_FILE);
+		if (default_file == NULL)
 			return;
 	}
 
@@ -531,16 +533,16 @@ set_defaults(void)
 	FILE  *ofp;
 
 
-	if (asprintf(&new_file, "%s%s%s", prefix, prefix[0]?"/":"", NEW_USER_FILE) == -1)
-	{
+	new_file = aprintf("%s%s%s", prefix, prefix[0]?"/":"", NEW_USER_FILE);
+	if (new_file == NULL) {
 		fprintf(stderr, _("%s: cannot create new defaults file: %s\n"),
 		        Prog, strerror(errno));
 		return -1;
         }
 
 	if (prefix[0]) {
-		if (asprintf(&default_file, "%s/%s", prefix, USER_DEFAULTS_FILE) == -1)
-		{
+		default_file = aprintf("%s/%s", prefix, USER_DEFAULTS_FILE);
+		if (default_file == NULL) {
 			fprintf(stderr,
 			        _("%s: cannot create new defaults file: %s\n"),
 			        Prog, strerror(errno));
diff --git a/src/userdel.c b/src/userdel.c
index 6bc4074bc..caf34606c 100644
--- a/src/userdel.c
+++ b/src/userdel.c
@@ -51,6 +51,7 @@
 #include "subordinateio.h"
 #endif				/* ENABLE_SUBIDS */
 #include "shadowlog.h"
+#include "string/sprintf/aprintf.h"
 #include "string/sprintf/xasprintf.h"
 #include "string/strcmp/streq.h"
 #include "string/strcmp/strprefix.h"
@@ -856,7 +857,8 @@ static int remove_tcbdir (const char *user_name, uid_t user_id)
 		return 0;
 	}
 
-	if (asprintf(&buf, TCB_DIR "/%s", user_name) == -1) {
+	buf = aprintf(TCB_DIR "/%s", user_name);
+	if (buf == NULL) {
 		fprintf(stderr,
 		        _("%s: Can't allocate memory, tcb entry for %s not removed.\n"),
 		        Prog, user_name);
diff --git a/src/vipw.c b/src/vipw.c
index dbc87db9a..e729d6dfb 100644
--- a/src/vipw.c
+++ b/src/vipw.c
@@ -43,6 +43,7 @@
 #endif				/* WITH_TCB */
 #include "shadowlog.h"
 #include "sssd.h"
+#include "string/sprintf/aprintf.h"
 #include "string/sprintf/snprintf.h"
 #include "string/sprintf/xasprintf.h"
 #include "string/strcmp/streq.h"
@@ -428,8 +429,9 @@ vipwedit (const char *file, int (*file_lock) (void), int (*file_unlock) (void))
 		if (stat (file, &st1) != 0) {
 			vipwexit (_("failed to stat edited file"), errno, 1);
 		}
-		if (asprintf(&to_rename, "%s+", file) == -1)
-			vipwexit (_("asprintf(3) failed"), errno, 1);
+		to_rename = aprintf("%s+", file);
+		if (to_rename == NULL)
+			vipwexit (_("aprintf() failed"), errno, 1);
 
 		if (create_backup_file (f, to_rename, &st1) != 0) {
 			free(to_rename);