[asterisk-commits] kpfleming: trunk r44477 - in /trunk: ./ main/app.c

[asterisk-commits at lists.digium.com]

Author: kpfleming
Date: Thu Oct  5 11:11:09 2006
New Revision: 44477

URL: http://svn.digium.com/view/asterisk?rev=44477&view=rev
Log:
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

........

Modified:
    trunk/   (props changed)
    trunk/main/app.c

Propchange: trunk/
------------------------------------------------------------------------------
Binary property 'branch-1.4-merged' - no diff available.

Modified: trunk/main/app.c
URL: http://svn.digium.com/view/asterisk/trunk/main/app.c?rev=44477&r1=44476&r2=44477&view=diff
==============================================================================
--- trunk/main/app.c (original)
+++ trunk/main/app.c Thu Oct  5 11:11:09 2006
@@ -1316,14 +1316,14 @@
 		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;