From: Kevin P. Fleming Date: Fri, 11 Nov 2005 01:01:19 +0000 (+0000) Subject: ugh... another broken commit X-Git-Tag: 1.2.0-rc2~25 X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=9e4c207dd30489be44ee77c41f0f97d0290b53c5;p=thirdparty%2Fasterisk.git 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 1e76812a1e..bd2c879146 100755 --- a/ChangeLog +++ b/ChangeLog @@ -1,5 +1,7 @@ 2005-11-10 Kevin P. Fleming + * 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 bcb5c22598..ea83601c2a 100755 --- 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;