[Asterisk-cvs] asterisk pbx.c,1.130,1.131

[markster at lists.digium.com]

Update of /usr/cvsroot/asterisk
In directory mongoose.digium.com:/tmp/cvs-serv11490

Modified Files:
	pbx.c 
Log Message:
Cleanup handling of complex expressions (bug #1919)


Index: pbx.c
===================================================================
RCS file: /usr/cvsroot/asterisk/pbx.c,v
retrieving revision 1.130
retrieving revision 1.131
diff -u -d -r1.130 -r1.131
--- pbx.c	25 Jun 2004 04:07:52 -0000	1.130
+++ pbx.c	25 Jun 2004 18:23:26 -0000	1.131
@@ -1099,10 +1099,15 @@
 				if ((vare[0] == '$') && (vare[1] == '[')) {
 					needsub++;
 					brackets++;
+					vare++;
+				} else if (vare[0] == '[') {
+					brackets++;
 				} else if (vare[0] == ']') {
 					brackets--;
-				} else if ((vare[0] == '$') && (vare[1] == '{'))
+				} else if ((vare[0] == '$') && (vare[1] == '{')) {
 					needsub++;
+					vare++
+				}
 				vare++;
 			}
 			if (brackets)