aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorkpfleming <kpfleming@f38db490-d61c-443f-a65b-d21fe96a405b>2005-11-11 01:01:19 +0000
committerkpfleming <kpfleming@f38db490-d61c-443f-a65b-d21fe96a405b>2005-11-11 01:01:19 +0000
commit398cfbb083aa0f735a875c8101b580bc69b9b121 (patch)
treed467bde8188f904aed0fe9dce0b212f567ee32bf
parent0143c7ae3a3f1ab6d3cf26ed069d14fcc3ea20fa (diff)
ugh... another broken commit
git-svn-id: http://svn.digium.com/svn/asterisk/trunk@7066 f38db490-d61c-443f-a65b-d21fe96a405b
-rwxr-xr-xChangeLog2
-rwxr-xr-xapp.c3
2 files changed, 4 insertions, 1 deletions
diff --git a/ChangeLog b/ChangeLog
index 1e76812a1..bd2c87914 100755
--- 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 bcb5c2259..ea83601c2 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;