From: Derick Rethans <derick@php.net>
Date: Mon, 6 Jun 2005 13:07:56 +0000 (+0000)
Subject: - MH44: Problems with user defined error handler and wrong usage of references
X-Git-Tag: php-5.0.5RC1~202
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=d8eb4055f0b1175218ef111cc6041a3cc8bd3dc0;p=php

- 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 084c7f9d2e..0e7a76150a 100644
--- 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;
 			}
 		}