diff options
| author | Dmitry Stogov <dmitry@zend.com> | 2013-01-09 17:52:48 +0400 |
|---|---|---|
| committer | Dmitry Stogov <dmitry@zend.com> | 2013-01-09 17:52:48 +0400 |
| commit | c3ebd6305ec4325827b7c4b9adc322820e124b26 (patch) | |
| tree | 53d21a0e6ef9b4027e3a1eea4430e8ffc5f5007b /Zend/zend_language_parser.y | |
| parent | 326f896739785cfcd36ef918dbd399ac605f6552 (diff) | |
| parent | 625000ab442dd4c1bfc6975a4a979f2c5f60a78d (diff) | |
| download | php-git-c3ebd6305ec4325827b7c4b9adc322820e124b26.tar.gz | |
Merge branch 'PHP-5.4' into PHP-5.5
* PHP-5.4:
Fixed compilator bug that might cause jump depended on unitialized value
Diffstat (limited to 'Zend/zend_language_parser.y')
| -rw-r--r-- | Zend/zend_language_parser.y | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/Zend/zend_language_parser.y b/Zend/zend_language_parser.y index e65910d2d5..781d806fe7 100644 --- a/Zend/zend_language_parser.y +++ b/Zend/zend_language_parser.y @@ -386,13 +386,13 @@ unticked_class_declaration_statement: implements_list '{' class_statement_list - '}' { zend_do_end_class_declaration(&$1, &$2 TSRMLS_CC); } + '}' { zend_do_end_class_declaration(&$1, &$3 TSRMLS_CC); } | interface_entry T_STRING { zend_do_begin_class_declaration(&$1, &$2, NULL TSRMLS_CC); } interface_extends_list '{' class_statement_list - '}' { zend_do_end_class_declaration(&$1, &$2 TSRMLS_CC); } + '}' { zend_do_end_class_declaration(&$1, NULL TSRMLS_CC); } ; |