Patch zend_call_user_function_prefer_ref for Scripting Engine problem Bug #52939

Patch version 2010-09-28 01:57 UTC

Obsolete patches:

• zend_call_user_function_prefer_ref, revision 2010-09-28 01:50 UTC

Developer: cataphract@php.net

  Index: zend_execute_API.c
  ===================================================================
  --- zend_execute_API.c	(revision 303758)
  +++ zend_execute_API.c	(working copy)
 @@ -857,7 +857,7 @@
  			SEPARATE_ZVAL(fci->params[i]);
  		}
  
 -		if (ARG_SHOULD_BE_SENT_BY_REF(EX(function_state).function, i + 1)
 +		if (ARG_MUST_BE_SENT_BY_REF(EX(function_state).function, i + 1)
 @@ -860,7 +860,9 @@
  		if (ARG_SHOULD_BE_SENT_BY_REF(EX(function_state).function, i + 1)
   			&& !PZVAL_IS_REF(*fci->params[i])) {
   
  			if (Z_REFCOUNT_PP(fci->params[i]) > 1) {
 -			if (Z_REFCOUNT_PP(fci->params[i]) > 1) {
 +			if (Z_REFCOUNT_PP(fci->params[i]) > 1 &&
 +				ARG_MUST_BE_SENT_BY_REF(EX(function_state).function, i + 1)) {
 +
  				zval *new_zval;
  
  				if (fci->no_separation) {