[Asterisk-cvs] asterisk ChangeLog,1.100,1.101 app.c,1.84,1.85

[kpfleming]

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

Modified Files:
	ChangeLog app.c 
Log Message:
ugh... another broken commit


Index: ChangeLog
===================================================================
RCS file: /usr/cvsroot/asterisk/ChangeLog,v
retrieving revision 1.100
retrieving revision 1.101
diff -u -d -r1.100 -r1.101
--- ChangeLog	11 Nov 2005 00:53:19 -0000	1.100
+++ ChangeLog	11 Nov 2005 01:01:19 -0000	1.101
@@ -1,5 +1,7 @@
 2005-11-10  Kevin P. Fleming  <kpfleming at digium.com>
 
+	* app.c (ast_app_parse_options): ok, so we aren't all perfect... let's make the while loop actually work properly here (issue #5684)
+
 	* apps/app_disa.c (disa_exec): correct password file parsing (issue #5676)
 
 	* apps/app_meetme.c (conf_run): don't restrict admin users from joining a locked conference (issue #5680)

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