Index: app.c
===================================================================
RCS file: /usr/cvsroot/asterisk/app.c,v
retrieving revision 1.58
diff -u -r1.58 app.c
--- app.c	29 Apr 2005 17:00:33 -0000	1.58
+++ app.c	3 May 2005 21:48:37 -0000
@@ -1070,16 +1070,20 @@
 int ast_separate_app_args(char *buf, char delim, char **array, int arraylen)
 {
 	int x = 0;
+	int argc = 0;
 	memset(array, 0, arraylen * sizeof(char *));
 	if (!buf)
 		return 0;
-	for (array[x] = buf ; x < arraylen && array[x]; x++) {
+	for (array[x] = buf ; x < (arraylen-1) && array[x]; x++) {
+		if (!x)
+			argc++;
 		if ((array[x+1] = strchr(array[x], delim))) {
 			*array[x+1] = '\0';
 			array[x+1]++;
+			argc++;
 		}
 	}
-	return x;
+	return argc;
 }
 
 int ast_lock_path(const char *path)