[Asterisk-cvs] asterisk ChangeLog,1.86,1.87 app.c,1.83,1.84

[kpfleming]

Update of /usr/cvsroot/asterisk
In directory mongoose.digium.com:/tmp/cvs-serv9915

Modified Files:
	ChangeLog app.c 
Log Message:
slight correction to options parsing


Index: ChangeLog
===================================================================
RCS file: /usr/cvsroot/asterisk/ChangeLog,v
retrieving revision 1.86
retrieving revision 1.87
diff -u -d -r1.86 -r1.87
--- ChangeLog	10 Nov 2005 23:12:09 -0000	1.86
+++ ChangeLog	10 Nov 2005 23:18:03 -0000	1.87
@@ -1,10 +1,12 @@
 2005-11-10  Kevin P. Fleming  <kpfleming at digium.com>
 
+	* app.c (ast_app_parse_options): don't increment 's' until after checking for NULL (related to issue #5630)
+
 	* apps/app_rpt.c: solve a memory leak (config structure was not freed) (issue #5706
 
 2005-11-10  Russell Bryant <russell at digium.com>
 
-	* app.c (ast_app_separate_args): Don't consider the open parenthesis as part of the arguments to an option.
+	* app.c (ast_app_separate_args): Don't consider the open parenthesis as part of the arguments to an option. (issue #5630)
 	* many files: Change all references to ast_separate_app_args to ast_app_separate_args
 	* many files in apps/: Clean up some application descriptions. Make sure all descriptions in changed files are wrapped at 80 characters.
 

Index: app.c
===================================================================
RCS file: /usr/cvsroot/asterisk/app.c,v
retrieving revision 1.83
retrieving revision 1.84
diff -u -d -r1.83 -r1.84
--- app.c	10 Nov 2005 23:12:09 -0000	1.83
+++ app.c	10 Nov 2005 23:18:03 -0000	1.84
@@ -1544,7 +1544,7 @@
 		if (*s == '(') {
 			/* Has argument */
 			arg = ++s;
-			while (*++s && (*s != ')'));
+			while (*s && (*s++ != ')'));
 			if (*s) {
 				if (argloc)
 					args[argloc - 1] = arg;