Merge branch 'PHP-8.0'

nikic · nikic · commit 53fba3a13d0c · 2021-07-02T10:08:57.000+02:00
* PHP-8.0:
  Fixed bug #80173
diff --git a/Zend/tests/write_property_ref_overwrite_return.phpt b/Zend/tests/write_property_ref_overwrite_return.phpt
@@ -0,0 +1,12 @@
+--TEST--
+Using return of property assignment to reference that destroys object
+--FILE--
+<?php
+
+$a = new stdClass;
+$a->a =& $a;
+var_dump($a->a = 0);
+
+?>
+--EXPECT--
+int(0)
diff --git a/Zend/zend_object_handlers.c b/Zend/zend_object_handlers.c
@@ -738,7 +738,8 @@ ZEND_API zval *zend_std_write_property(zend_object *zobj, zend_string *name, zva
 			}
 
 found:
-			zend_assign_to_variable(variable_ptr, value, IS_TMP_VAR, property_uses_strict_types());
+			variable_ptr = zend_assign_to_variable(
+				variable_ptr, value, IS_TMP_VAR, property_uses_strict_types());
 			goto exit;
 		}
 		if (Z_PROP_FLAG_P(variable_ptr) == IS_PROP_UNINIT) {

Original file line number	Diff line number	Diff line change
`@@ -738,7 +738,8 @@ ZEND_API zval zend_std_write_property(zend_object zobj, zend_string *name, zva`
`738`	`738`	`}`
`739`	`739`
`740`	`740`	`found:`
`741`		`- zend_assign_to_variable(variable_ptr, value, IS_TMP_VAR, property_uses_strict_types());`
	`741`	`+ variable_ptr = zend_assign_to_variable(`
	`742`	`+ variable_ptr, value, IS_TMP_VAR, property_uses_strict_types());`
`742`	`743`	`goto exit;`
`743`	`744`	`}`
`744`	`745`	`if (Z_PROP_FLAG_P(variable_ptr) == IS_PROP_UNINIT) {`