cvs: ZendEngine2 / zend_execute_API.c

helly           Thu Feb  8 12:30:40 2007 UTC

  Modified files:              
    /ZendEngine2        zend_execute_API.c 
  Log:
  - Do not set is_ref/refcount for functions that return by reference
  
http://cvs.php.net/viewvc.cgi/ZendEngine2/zend_execute_API.c?r1=1.392&r2=1.393&diff_format=u
Index: ZendEngine2/zend_execute_API.c
diff -u ZendEngine2/zend_execute_API.c:1.392 
ZendEngine2/zend_execute_API.c:1.393
--- ZendEngine2/zend_execute_API.c:1.392        Mon Jan  1 09:29:20 2007
+++ ZendEngine2/zend_execute_API.c      Thu Feb  8 12:30:40 2007
@@ -17,7 +17,7 @@
    +----------------------------------------------------------------------+
 */
 
-/* $Id: zend_execute_API.c,v 1.392 2007/01/01 09:29:20 sebastian Exp $ */
+/* $Id: zend_execute_API.c,v 1.393 2007/02/08 12:30:40 helly Exp $ */
 
 #include <stdio.h>
 #include <signal.h>
@@ -1053,7 +1053,10 @@
                        EG(scope) = EX(function_state).function->common.scope;
                }
                ((zend_internal_function *) 
EX(function_state).function)->handler(fci->param_count, *fci->retval_ptr_ptr, 
EX(function_state).function->common.return_reference?fci->retval_ptr_ptr:NULL, 
(fci->object_pp?*fci->object_pp:NULL), 1 TSRMLS_CC);
-               INIT_PZVAL(*fci->retval_ptr_ptr);
+               if (!EX(function_state).function->common.return_reference)
+               {
+                       INIT_PZVAL(*fci->retval_ptr_ptr);
+               }
        }
        zend_ptr_stack_clear_multiple(TSRMLS_C);
        if (call_via_handler) {

-- 
Zend Engine CVS Mailing List (http://cvs.php.net/)
To unsubscribe, visit: http://www.php.net/unsub.php