From: Derick Rethans <derick@php.net>
Date: Tue, 7 Jun 2005 09:59:48 +0000 (+0000)
Subject: - MF44: Problems with user defined error handler and references
X-Git-Tag: php-5.0.5RC1~196
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=5db859f053856e6342ec91785ed24ceebd4d53ae;p=php

- MF44: Problems with user defined error handler and references
---

diff --git a/Zend/zend_execute.c b/Zend/zend_execute.c
index 0e7a76150a..f81cc54cf0 100644
--- 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);
 	}