From 3ef0710fa4f487e8887a8c16714c6443009e4a47 Mon Sep 17 00:00:00 2001
From: Jeremy Allison <jra@samba.org>
Date: Wed, 15 Sep 2004 22:49:23 +0000
Subject: r2361: Fix the appalling toktocliplist() fn. Bug found by Luis
 Benvenutto. Jeremy. (This used to be commit
 d434d8e2b47bc8553ee04bd7211f622e3fcbb7fb)

---
 source3/lib/util_str.c | 13 ++++++++-----
 1 file changed, 8 insertions(+), 5 deletions(-)

(limited to 'source3/lib')

diff --git a/source3/lib/util_str.c b/source3/lib/util_str.c
index 6eee62c14a..65a616ad41 100644
--- a/source3/lib/util_str.c
+++ b/source3/lib/util_str.c
@@ -134,17 +134,20 @@ char **toktocliplist(int *ctok, const char *sep)
 	*ctok=ictok;
 	s=(char *)last_ptr;
 	
-	if (!(ret=iret=malloc(ictok*sizeof(char *))))
+	if (!(ret=iret=malloc((ictok+1)*sizeof(char *))))
 		return NULL;
 	
 	while(ictok--) {    
 		*iret++=s;
-		while(*s++)
-			;
-		while(!*s)
-			s++;
+		if (ictok > 0) {
+			while(*s++)
+				;
+			while(!*s)
+				s++;
+		}
 	}
 
+	ret[*ctok] = NULL;
 	return ret;
 }
 
-- 
cgit