From: Kevin P. Fleming <kpfleming@digium.com>
Date: Thu, 5 Oct 2006 16:11:09 +0000 (+0000)
Subject: Merged revisions 44476 via svnmerge from
X-Git-Tag: 1.6.0-beta1~3^2~4507
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=8f1fc1ca088ef61156a2a8411cf0e7e3395bac5a;p=thirdparty%2Fasterisk.git

Merged revisions 44476 via svnmerge from
https://origsvn.digium.com/svn/asterisk/branches/1.4

........
r44476 | kpfleming | 2006-10-05 11:10:01 -0500 (Thu, 05 Oct 2006) | 3 lines

don't segfault when an argument without a close parenthesis is found
stop parsing as soon as that situation occurs

........


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

diff --git a/main/app.c b/main/app.c
index 20620a62fc..d3e9f2a100 100644
--- a/main/app.c
+++ b/main/app.c
@@ -1316,14 +1316,14 @@ int ast_app_parse_options(const struct ast_app_option *options, struct ast_flags
 		if (*s == '(') {
 			/* Has argument */
 			arg = ++s;
-			s = strchr(s, ')');
-			if (*s) {
+			if ((s = strchr(s, ')'))) {
 				if (argloc)
 					args[argloc - 1] = arg;
 				*s++ = '\0';
 			} else {
 				ast_log(LOG_WARNING, "Missing closing parenthesis for argument '%c' in string '%s'\n", curarg, arg);
 				res = -1;
+				break;
 			}
 		} else if (argloc) {
 			args[argloc - 1] = NULL;