- MF44: Problems with user defined error handler and references

diff --git a/Zend/zend_execute.c b/Zend/zend_execute.c
index 0e7a76150a2448c79e3b13742becc344241197c0..f81cc54cf02adb5568f5e3e151c7060becf32e0c 100644 (file)
--- a/Zend/zend_execute.c
+++ b/Zend/zend_execute.c
@@ -2263,8 +2263,8 @@ int zend_assign_ref_handler(ZEND_OPCODE_HANDLER_ARGS)
            !(*value_ptr_ptr)->is_ref &&
            opline->extended_value == ZEND_RETURNS_FUNCTION && 
            !EX_T(opline->op2.u.var).var.fcall_returned_reference) {
-               zend_error(E_STRICT, "Only variables should be assigned by reference");
                PZVAL_LOCK(*value_ptr_ptr); /* undo the effect of get_zval_ptr_ptr() */
+               zend_error(E_STRICT, "Only variables should be assigned by reference");
                return zend_assign_handler(ZEND_OPCODE_HANDLER_ARGS_PASSTHRU);
        }