diff options
| -rw-r--r-- | NEWS | 2 | ||||
| -rw-r--r-- | Zend/tests/bug70828.phpt | 24 | ||||
| -rw-r--r-- | Zend/zend_compile.c | 2 |
3 files changed, 27 insertions, 1 deletions
@@ -3,6 +3,8 @@ PHP NEWS ?? ??? 2015, PHP 5.6.16 - Core: + . Fixed bug #70828 (php-fpm 5.6 with opcache crashes when referencing a + non-existent constant). (Laruence) . Fixed bug #70748 (Segfault in ini_lex () at Zend/zend_ini_scanner.l). (Laruence) diff --git a/Zend/tests/bug70828.phpt b/Zend/tests/bug70828.phpt new file mode 100644 index 0000000000..dd285b56ac --- /dev/null +++ b/Zend/tests/bug70828.phpt @@ -0,0 +1,24 @@ +--TEST-- +Bug #70828 (php-fpm 5.6 with opcache crashes when referencing a non-existent constant) +--FILE-- +<?php + +namespace test { + use const nonexistent; + + class test { + static function run(){ + var_dump(nonexistent); + existent; + } + } +} + +namespace { + define("test\\existent", "bug!", 1); + test\test::run(); +} +?> +--EXPECTF-- +Notice: Use of undefined constant nonexistent - assumed 'nonexistent' in /home/huixinchen/opensource/php-5.6/Zend/tests/bug70828.php on line 8 +string(11) "nonexistent" diff --git a/Zend/zend_compile.c b/Zend/zend_compile.c index 5ff1b042c2..fca4e2a04d 100644 --- a/Zend/zend_compile.c +++ b/Zend/zend_compile.c @@ -5804,7 +5804,7 @@ void zend_do_fetch_constant(znode *result, znode *constant_container, znode *con opline->op2.constant = zend_add_const_name_literal(CG(active_op_array), &constant_name->u.constant, 0 TSRMLS_CC); } else { opline->extended_value = IS_CONSTANT_UNQUALIFIED; - if (CG(current_namespace)) { + if (check_namespace && CG(current_namespace)) { opline->extended_value |= IS_CONSTANT_IN_NAMESPACE; opline->op2.constant = zend_add_const_name_literal(CG(active_op_array), &constant_name->u.constant, 1 TSRMLS_CC); } else { |