diff options
| author | Xinchen Hui <laruence@gmail.com> | 2019-03-14 16:46:46 +0800 |
|---|---|---|
| committer | Xinchen Hui <laruence@gmail.com> | 2019-03-14 16:46:46 +0800 |
| commit | e3965913c41836eef0583089bafb0a29fa53dec2 (patch) | |
| tree | b0e7c7a3ec9a9691eb0d1c8507c7cbda91eb9a47 /Zend | |
| parent | a7739be22f8b376c58d666caa4479005e14bc2fa (diff) | |
| parent | c7920aba3e1892accca7cd13ef5b8a8fbf48b5c2 (diff) | |
| download | php-git-e3965913c41836eef0583089bafb0a29fa53dec2.tar.gz | |
Merge branch 'PHP-7.2' into PHP-7.3
* PHP-7.2:
Fixed bug #77738 (Nullptr deref in zend_compile_expr)
Diffstat (limited to 'Zend')
| -rw-r--r-- | Zend/tests/bug77738.phpt | 8 | ||||
| -rw-r--r-- | Zend/zend_compile.c | 4 |
2 files changed, 10 insertions, 2 deletions
diff --git a/Zend/tests/bug77738.phpt b/Zend/tests/bug77738.phpt new file mode 100644 index 0000000000..e3a453c405 --- /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 90679c8cc9..284b92ea6e 100644 --- a/Zend/zend_compile.c +++ b/Zend/zend_compile.c @@ -7761,11 +7761,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_ex(resolved_name, 0); |