From: Volker Lendecke <vl@samba.org>
Date: Mon, 28 Nov 2022 09:55:04 +0000 (+0100)
Subject: lib: Use talloc_asprintf_addbuf() in str_list_join_shell()
X-Git-Tag: talloc-2.4.0~253
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=c692b5c95bdc0d96ab7797a59b94addaa1c80d94;p=thirdparty%2Fsamba.git

lib: Use talloc_asprintf_addbuf() in str_list_join_shell()

This adds proper NULL checks via talloc_asprintf_addbuf()

Signed-off-by: Volker Lendecke <vl@samba.org>
Reviewed-by: Jeremy Allison <jra@samba.org>
---

diff --git a/lib/util/util_strlist.c b/lib/util/util_strlist.c
index a1b80d464d5..e10200260fd 100644
--- a/lib/util/util_strlist.c
+++ b/lib/util/util_strlist.c
@@ -210,10 +210,11 @@ _PUBLIC_ char *str_list_join_shell(TALLOC_CTX *mem_ctx, const char **list, char
 		ret = talloc_strdup(mem_ctx, list[0]);
 
 	for (i = 1; list[i]; i++) {
-		if (strchr(list[i], ' ') || strlen(list[i]) == 0)
-			ret = talloc_asprintf_append_buffer(ret, "%c\"%s\"", sep, list[i]);
-		else
-			ret = talloc_asprintf_append_buffer(ret, "%c%s", sep, list[i]);
+		if (strchr(list[i], ' ') || strlen(list[i]) == 0) {
+			talloc_asprintf_addbuf(&ret, "%c\"%s\"", sep, list[i]);
+		} else {
+			talloc_asprintf_addbuf(&ret, "%c%s", sep, list[i]);
+		}
 	}
 
 	return ret;