Revert "Refix bug #73686"

This reverts commit 4589386026dbf15d980ba0c7c92dc587cead15e8.

diff --git a/Zend/zend_execute.c b/Zend/zend_execute.c
index 621fae74a3f3a36d2784cc64fc5b1f297b3ca3ea..647428f9592fa08da39c98a463bc343fa3fb0607 100644 (file)
--- a/Zend/zend_execute.c
+++ b/Zend/zend_execute.c
@@ -1094,10 +1094,6 @@ static zend_never_inline void zend_assign_to_object_dim(zval *object, zval *dim,
                return;
        }
 
-       if (UNEXPECTED(Z_ISREF_P(value))) {
-               value = Z_REFVAL_P(value);
-       }
-
        Z_OBJ_HT_P(object)->write_dimension(object, dim, value);
 }
 

diff --git a/ext/spl/spl_array.c b/ext/spl/spl_array.c
index bddf64ee57e59148ded8e559fcc32070e142deb1..d3fbb95991262ea9b8bd38423c44bbf50fc24e3b 100644 (file)
--- a/ext/spl/spl_array.c
+++ b/ext/spl/spl_array.c
@@ -473,6 +473,11 @@ static void spl_array_write_dimension_ex(int check_inherited, zval *object, zval
                return;
        }
 
+       if (UNEXPECTED(Z_ISREF_P(value) &&
+               Z_REFCOUNTED_P(value) == 1)) {
+               ZVAL_UNREF(value);
+       }
+
        if (Z_REFCOUNTED_P(value)) {
                Z_ADDREF_P(value);
        }