- Revert patch which checks at run-time if you're allowed to assign

- certain values by reference.
- We still need to find a solution for cases when this shouldn't be allowed
- as it might cause leaks.

diff --git a/Zend/zend_execute.c b/Zend/zend_execute.c
index 1f65c9ce0c57d7f86e7a56e6e25691a42177eb0a..858766817be9b2b9e0899ccfcb22e06f3fd91ebd 100644 (file)
--- a/Zend/zend_execute.c
+++ b/Zend/zend_execute.c
@@ -1555,12 +1555,6 @@ binary_assign_op_addr_obj:
                                {
                                        zval **value_ptr_ptr = get_zval_ptr_ptr(&EX(opline)->op2, EX(Ts), BP_VAR_W);
 
-                                       if (value_ptr_ptr = EX(Ts)[EX(opline)->op2.u.var].var.ptr_ptr) {
-                                               if (!(*value_ptr_ptr != &EG(uninitialized_zval) && (PZVAL_IS_REF(*value_ptr_ptr) || (*value_ptr_ptr)->refcount == 1)))
-                                               {
-                                                       zend_error(E_ERROR, "Can't assign by reference non-referencable value!");
-                                               }
-                                       }
                                        zend_assign_to_variable_reference(&EX(opline)->result, get_zval_ptr_ptr(&EX(opline)->op1, EX(Ts), BP_VAR_W), value_ptr_ptr, EX(Ts) TSRMLS_CC);
                                        NEXT_OPCODE();
                                }