- MH44: Problems with user defined error handler and wrong usage of references

diff --git a/Zend/zend_execute.c b/Zend/zend_execute.c
index 084c7f9d2e0917d3c2d65e9b13f71755a47481a5..0e7a76150a2448c79e3b13742becc344241197c0 100644 (file)
--- a/Zend/zend_execute.c
+++ b/Zend/zend_execute.c
@@ -2881,8 +2881,8 @@ int zend_return_handler(ZEND_OPCODE_HANDLER_ARGS)
                if (!(*retval_ptr_ptr)->is_ref) {
                        if (EX_T(opline->op1.u.var).var.ptr_ptr == &EX_T(opline->op1.u.var).var.ptr
                                || (opline->extended_value == ZEND_RETURNS_FUNCTION && !EX_T(opline->op1.u.var).var.fcall_returned_reference)) {
-                               zend_error(E_STRICT, "Only variable references should be returned by reference");
                                PZVAL_LOCK(*retval_ptr_ptr); /* undo the effect of get_zval_ptr_ptr() */
+                               zend_error(E_STRICT, "Only variable references should be returned by reference");
                                goto return_by_value;
                        }
                }