summaryrefslogtreecommitdiff
path: root/source3/libads/ads_struct.c
diff options
context:
space:
mode:
authorJeremy Allison <jeremy@jeremy-desktop.(none)>2008-12-23 11:56:48 -0800
committerJeremy Allison <jeremy@jeremy-desktop.(none)>2008-12-23 11:56:48 -0800
commit1966a947d3f8d432d3af5a9c0004e27561ae7f65 (patch)
treeab3bc78c9223c676536f268b8633eef8c5eb6613 /source3/libads/ads_struct.c
parent94df767f21003507f01b9b08d7c52b5b8819977f (diff)
downloadsamba-1966a947d3f8d432d3af5a9c0004e27561ae7f65.tar.gz
samba-1966a947d3f8d432d3af5a9c0004e27561ae7f65.tar.bz2
samba-1966a947d3f8d432d3af5a9c0004e27561ae7f65.zip
More asprintf warning fixes.
Jeremy.
Diffstat (limited to 'source3/libads/ads_struct.c')
-rw-r--r--source3/libads/ads_struct.c11
1 files changed, 8 insertions, 3 deletions
diff --git a/source3/libads/ads_struct.c b/source3/libads/ads_struct.c
index 8cc2f1215e..aef35ad822 100644
--- a/source3/libads/ads_struct.c
+++ b/source3/libads/ads_struct.c
@@ -57,12 +57,17 @@ char *ads_build_path(const char *realm, const char *sep, const char *field, int
strlcat(ret, p, len);
while ((p=strtok_r(NULL, sep, &saveptr)) != NULL) {
- char *s;
+ int retval;
+ char *s = NULL;
if (reverse)
- asprintf(&s, "%s%s,%s", field, p, ret);
+ retval = asprintf(&s, "%s%s,%s", field, p, ret);
else
- asprintf(&s, "%s,%s%s", ret, field, p);
+ retval = asprintf(&s, "%s,%s%s", ret, field, p);
free(ret);
+ if (retval == -1) {
+ free(r);
+ return NULL;
+ }
ret = SMB_STRDUP(s);
free(s);
}