com php-src: PHP must not create circular arrays when element is assigned by value.: Zend/tests/gc_032.phpt Zend/zend_compi le.c

From: Date: Thu, 12 Oct 2017 13:23:45 +0000
Subject: com php-src: PHP must not create circular arrays when element is assigned by value.: Zend/tests/gc_032.phpt Zend/zend_compi le.c
Groups: php.cvs 
Request: Send a blank email to php-cvs+get-99725@lists.php.net to get a copy of this message
Commit: edc7c8ccfa0eb7c6064575e2155f30797adf6684 Author: Dmitry Stogov <dmitry@zend.com> Thu, 12 Oct 2017 16:23:45 +0300 Parents: eb4342eb141be5a55cf32e4d3a893530564e7ffd Branches: master Link: http://git.php.net/?p=php-src.git;a=commitdiff;h=edc7c8ccfa0eb7c6064575e2155f30797adf6684 Log: PHP must not create circular arrays when element is assigned by value. Changed paths: M Zend/tests/gc_032.phpt M Zend/zend_compile.c Diff: diff --git a/Zend/tests/gc_032.phpt b/Zend/tests/gc_032.phpt index b11a665..d0d36b2 100644 --- a/Zend/tests/gc_032.phpt +++ b/Zend/tests/gc_032.phpt @@ -14,20 +14,19 @@ $a[0][0] = $a; debug_zval_dump($a); ?> --EXPECTF-- -array(1) refcount(%d){ +array(1) refcount(2){ [0]=> - array(1) refcount(%d){ - [0]=> - *RECURSION* + array(0) refcount(1){ } } -array(1) refcount(%d){ +array(1) refcount(2){ [0]=> - array(1) refcount(%d){ + array(1) refcount(1){ [0]=> - array(1) refcount(%d){ + array(1) refcount(1){ [0]=> - *RECURSION* + array(0) refcount(1){ + } } } } diff --git a/Zend/zend_compile.c b/Zend/zend_compile.c index 8d353b8..5e85a26 100644 --- a/Zend/zend_compile.c +++ b/Zend/zend_compile.c @@ -3000,7 +3000,13 @@ void zend_compile_assign(znode *result, zend_ast *ast) /* {{{ */ if (zend_is_assign_to_self(var_ast, expr_ast) && !is_this_fetch(expr_ast)) { /* $a[0] = $a should evaluate the right $a first */ - zend_compile_simple_var_no_cv(&expr_node, expr_ast, BP_VAR_R, 0); + znode cv_node; + + if (zend_try_compile_cv(&cv_node, expr_ast) == FAILURE) { + zend_compile_simple_var_no_cv(&expr_node, expr_ast, BP_VAR_R, 0); + } else { + zend_emit_op(&expr_node, ZEND_QM_ASSIGN, &cv_node, NULL); + } } else { zend_compile_expr(&expr_node, expr_ast); } @@ -3023,7 +3029,13 @@ void zend_compile_assign(znode *result, zend_ast *ast) /* {{{ */ case ZEND_AST_ARRAY: if (zend_list_has_assign_to_self(var_ast, expr_ast)) { /* list($a, $b) = $a should evaluate the right $a first */ - zend_compile_simple_var_no_cv(&expr_node, expr_ast, BP_VAR_R, 0); + znode cv_node; + + if (zend_try_compile_cv(&cv_node, expr_ast) == FAILURE) { + zend_compile_simple_var_no_cv(&expr_node, expr_ast, BP_VAR_R, 0); + } else { + zend_emit_op(&expr_node, ZEND_QM_ASSIGN, &cv_node, NULL); + } } else { zend_compile_expr(&expr_node, expr_ast); }

« previous php.cvs (#99725) next »