From 1966a947d3f8d432d3af5a9c0004e27561ae7f65 Mon Sep 17 00:00:00 2001
From: Jeremy Allison <jeremy@jeremy-desktop.(none)>
Date: Tue, 23 Dec 2008 11:56:48 -0800
Subject: More asprintf warning fixes. Jeremy.

---
 source3/libads/ads_struct.c | 11 ++++++++---
 1 file changed, 8 insertions(+), 3 deletions(-)

(limited to 'source3/libads/ads_struct.c')

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);
 		}
-- 
cgit