colder		Mon Oct  6 13:45:42 2008 UTC

  Added files:                 (Branch: PHP_5_2)
    /php-src/ext/spl/tests	bug46115.phpt 

  Modified files:              
    /php-src/ext/spl	spl_array.c 
  Log:
  MFH: bug #46115 (Fixes nothing in 5.2, but sync code)
  
http://cvs.php.net/viewvc.cgi/php-src/ext/spl/spl_array.c?r1=1.71.2.17.2.17&r2=1.71.2.17.2.18&diff_format=u
Index: php-src/ext/spl/spl_array.c
diff -u php-src/ext/spl/spl_array.c:1.71.2.17.2.17 php-src/ext/spl/spl_array.c:1.71.2.17.2.18
--- php-src/ext/spl/spl_array.c:1.71.2.17.2.17	Sun Oct  5 14:49:25 2008
+++ php-src/ext/spl/spl_array.c	Mon Oct  6 13:45:42 2008
@@ -16,7 +16,7 @@
    +----------------------------------------------------------------------+
  */
 
-/* $Id: spl_array.c,v 1.71.2.17.2.17 2008/10/05 14:49:25 colder Exp $ */
+/* $Id: spl_array.c,v 1.71.2.17.2.18 2008/10/06 13:45:42 colder Exp $ */
 
 #ifdef HAVE_CONFIG_H
 # include "config.h"
@@ -1197,6 +1197,7 @@
 	spl_array_object *intern = (spl_array_object*)zend_object_store_get_object(getThis() TSRMLS_CC);
 	HashTable *aht = spl_array_get_hash_table(intern, 0 TSRMLS_CC);
 	zval tmp, *arg;
+	zval *retval_ptr = NULL;
 	
 	INIT_PZVAL(&tmp);
 	Z_TYPE(tmp) = IS_ARRAY;
@@ -1207,9 +1208,12 @@
 			zend_throw_exception(spl_ce_BadMethodCallException, "Function expects exactly one argument", 0 TSRMLS_CC);
 			return;
 		}
-		zend_call_method(NULL, NULL, NULL, fname, fname_len, return_value_ptr, 2, &tmp, arg TSRMLS_CC);
+		zend_call_method(NULL, NULL, NULL, fname, fname_len, &retval_ptr, 2, &tmp, arg TSRMLS_CC);
 	} else {
-		zend_call_method(NULL, NULL, NULL, fname, fname_len, return_value_ptr, 1, &tmp, NULL TSRMLS_CC);
+		zend_call_method(NULL, NULL, NULL, fname, fname_len, &retval_ptr, 1, &tmp, NULL TSRMLS_CC);
+	}
+	if (retval_ptr) {
+		COPY_PZVAL_TO_ZVAL(*return_value, retval_ptr);
 	}
 }
 

http://cvs.php.net/viewvc.cgi/php-src/ext/spl/tests/bug46115.phpt?view=markup&rev=1.1
Index: php-src/ext/spl/tests/bug46115.phpt
+++ php-src/ext/spl/tests/bug46115.phpt