summaryrefslogtreecommitdiff
path: root/lib/util
diff options
context:
space:
mode:
authorVolker Lendecke <vl@samba.org>2022-11-28 10:55:04 +0100
committerJeremy Allison <jra@samba.org>2022-12-14 04:32:34 +0000
commitc692b5c95bdc0d96ab7797a59b94addaa1c80d94 (patch)
tree60f57d7df46a4f6f0974cf6a31ee113309b1671b /lib/util
parent2c7766c28f2801d0b103d6a5046098810a4f0bee (diff)
downloadsamba-c692b5c95bdc0d96ab7797a59b94addaa1c80d94.tar.gz
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>
Diffstat (limited to 'lib/util')
-rw-r--r--lib/util/util_strlist.c9
1 files changed, 5 insertions, 4 deletions
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;