com php-src: Fixed bug #77738 (Nullptr deref in zend_compile _expr): NEWS Zend/tests/bug77738.phpt Z end/zend_compile.c

From: Date: Thu, 14 Mar 2019 08:46:04 +0000
Subject: com php-src: Fixed bug #77738 (Nullptr deref in zend_compile _expr): NEWS Zend/tests/bug77738.phpt Z end/zend_compile.c
Groups: php.cvs 
Request: Send a blank email to php-cvs+get-105138@lists.php.net to get a copy of this message
Commit: c7920aba3e1892accca7cd13ef5b8a8fbf48b5c2 Author: Xinchen Hui <laruence@gmail.com> Thu, 14 Mar 2019 16:46:04 +0800 Parents: 6814ba11bc8c2638b7345aaea176fc7c678aa07f Branches: PHP-7.2 PHP-7.3 master Link: http://git.php.net/?p=php-src.git;a=commitdiff;h=c7920aba3e1892accca7cd13ef5b8a8fbf48b5c2 Log: Fixed bug #77738 (Nullptr deref in zend_compile_expr) Bugs: https://bugs.php.net/77738 Changed paths: M NEWS A Zend/tests/bug77738.phpt M Zend/zend_compile.c Diff: diff --git a/NEWS b/NEWS index 671df56..a088343 100644 --- a/NEWS +++ b/NEWS @@ -3,6 +3,7 @@ PHP NEWS ?? ??? 2019, PHP 7.2.17 - Core: + . Fixed bug #77738 (Nullptr deref in zend_compile_expr). (Laruence) . Fixed bug #77660 (Segmentation fault on break 2147483648). (Laruence) . Fixed bug #77652 (Anonymous classes can lose their interface information). (Nikita) diff --git a/Zend/tests/bug77738.phpt b/Zend/tests/bug77738.phpt new file mode 100644 index 0000000..e3a453c --- /dev/null +++ b/Zend/tests/bug77738.phpt @@ -0,0 +1,8 @@ +--TEST-- +Bug #77738 (Nullptr deref in zend_compile_expr) +--FILE-- +<?php +__COMPILER_HALT_OFFSET__; +; // <- important +--EXPECTF-- +Warning: Use of undefined constant __COMPILER_HALT_OFFSET__ - assumed '__COMPILER_HALT_OFFSET__' %sbug77738.php on line %d diff --git a/Zend/zend_compile.c b/Zend/zend_compile.c index d0bece7..a91dfee 100644 --- a/Zend/zend_compile.c +++ b/Zend/zend_compile.c @@ -7673,11 +7673,11 @@ void zend_compile_const(znode *result, zend_ast *ast) /* {{{ */ if (zend_string_equals_literal(resolved_name, "__COMPILER_HALT_OFFSET__") || (name_ast->attr != ZEND_NAME_RELATIVE && zend_string_equals_literal(orig_name, "__COMPILER_HALT_OFFSET__"))) { zend_ast *last = CG(ast); - while (last->kind == ZEND_AST_STMT_LIST) { + while (last && last->kind == ZEND_AST_STMT_LIST) { zend_ast_list *list = zend_ast_get_list(last); last = list->child[list->children-1]; } - if (last->kind == ZEND_AST_HALT_COMPILER) { + if (last && last->kind == ZEND_AST_HALT_COMPILER) { result->op_type = IS_CONST; ZVAL_LONG(&result->u.constant, Z_LVAL_P(zend_ast_get_zval(last->child[0]))); zend_string_release(resolved_name);

« previous php.cvs (#105138) next »