]> git.ipfire.org Git - thirdparty/samba.git/commitdiff
lib: Use talloc_asprintf_addbuf() in str_list_join_shell()
authorVolker Lendecke <vl@samba.org>
Mon, 28 Nov 2022 09:55:04 +0000 (10:55 +0100)
committerJeremy Allison <jra@samba.org>
Wed, 14 Dec 2022 04:32:34 +0000 (04:32 +0000)
This adds proper NULL checks via talloc_asprintf_addbuf()

Signed-off-by: Volker Lendecke <vl@samba.org>
Reviewed-by: Jeremy Allison <jra@samba.org>
lib/util/util_strlist.c

index a1b80d464d5668a2b6f929951566f0bb9971878d..e10200260fdaa1e1366022d7f4cd0adaae77bee8 100644 (file)
@@ -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;