diff options
| author | Xinchen Hui <laruence@gmail.com> | 2017-05-08 11:36:29 +0800 |
|---|---|---|
| committer | Xinchen Hui <laruence@gmail.com> | 2017-05-08 11:36:29 +0800 |
| commit | 2d30bc96a19bb46463134a09d8674accb393cbc2 (patch) | |
| tree | 855995a037cc70d41bdf44ffcf404992d36c38ff | |
| parent | 62c1edf535ee447582959be12c64a817184bb304 (diff) | |
| parent | b966a8b5fa70e881a12fde8b4d37461be7bf85cb (diff) | |
| download | php-git-2d30bc96a19bb46463134a09d8674accb393cbc2.tar.gz | |
Merge branch 'PHP-7.0' into PHP-7.1
* PHP-7.0:
Fixed another potential dangling pointer
| -rw-r--r-- | Zend/zend_compile.c | 7 |
1 files changed, 5 insertions, 2 deletions
diff --git a/Zend/zend_compile.c b/Zend/zend_compile.c index 27d4a7bb04..cea28d6ed0 100644 --- a/Zend/zend_compile.c +++ b/Zend/zend_compile.c @@ -8312,8 +8312,11 @@ void zend_eval_const_expr(zend_ast **ast_ptr) /* {{{ */ break; } - zend_eval_const_expr(&class_ast); - zend_eval_const_expr(&name_ast); + zend_eval_const_expr(&ast->child[0]); + zend_eval_const_expr(&ast->child[1]); + + class_ast = ast->child[0]; + name_ast = ast->child[1]; if (name_ast->kind == ZEND_AST_ZVAL && zend_string_equals_literal_ci(zend_ast_get_str(name_ast), "class")) { zend_error_noreturn(E_COMPILE_ERROR, |