ugh... another broken commit

git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@7066 65c4cc65-6c06-0410-ace0-fbb531ad65f3

diff --git a/ChangeLog b/ChangeLog
index 1e76812a1e01886de8e1824321d3faf24ce8aa4d..bd2c8791461af312c76aeaab8134b22e3f6fe0ae 100755 (executable)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,5 +1,7 @@
 2005-11-10  Kevin P. Fleming  <kpfleming@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)

diff --git a/app.c b/app.c
index bcb5c225983f233dd0a236f9bbc282c584b4728b..ea83601c2a4d3818aa305b646a19ac8129fa8f45 100755 (executable)
--- a/app.c
+++ b/app.c
@@ -1544,7 +1544,8 @@ int ast_app_parse_options(const struct ast_app_option *options, struct ast_flags
                if (*s == '(') {
                        /* Has argument */
                        arg = ++s;
-                       while (*s && (*s++ != ')'));
+                       while (*s && (*s != ')'))
+                               s++;
                        if (*s) {
                                if (argloc)
                                        args[argloc - 1] = arg;