From e4e42df4e6fc99bc05d243978146fb0b6e5b4085 Mon Sep 17 00:00:00 2001 From: Nikita Popov Date: Wed, 4 Jun 2014 17:15:16 +0200 Subject: [PATCH] Allow only simple variables with global keyword --- Zend/zend_language_parser.y | 9 +++------ 1 file changed, 3 insertions(+), 6 deletions(-) diff --git a/Zend/zend_language_parser.y b/Zend/zend_language_parser.y index 6eb2c4287e..e28949d71c 100644 --- a/Zend/zend_language_parser.y +++ b/Zend/zend_language_parser.y @@ -597,15 +597,12 @@ function_call_parameter: ; global_var_list: - global_var_list ',' global_var { zend_do_fetch_global_variable(&$3, NULL, ZEND_FETCH_GLOBAL_LOCK TSRMLS_CC); } - | global_var { zend_do_fetch_global_variable(&$1, NULL, ZEND_FETCH_GLOBAL_LOCK TSRMLS_CC); } + global_var_list ',' global_var + | global_var ; - global_var: - T_VARIABLE { $$ = $1; } - | '$' r_variable { $$ = $2; } - | '$' '{' expr '}' { $$ = $3; } + simple_variable { zend_do_fetch_global_variable(&$1, NULL, ZEND_FETCH_GLOBAL_LOCK TSRMLS_CC); } ; -- 2.50.1