[PHP-CVS] cvs: php-src(PHP_5_2) /ext/spl spl_array.c

[Etienne Kneuss]

colder          Mon Jul  7 00:02:22 2008 UTC

  Modified files:              (Branch: PHP_5_2)
    /php-src/ext/spl    spl_array.c 
  Log:
  Avoid a leak on return_value
  
http://cvs.php.net/viewvc.cgi/php-src/ext/spl/spl_array.c?r1=1.71.2.17.2.15&r2=1.71.2.17.2.16&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.15 
php-src/ext/spl/spl_array.c:1.71.2.17.2.16
--- php-src/ext/spl/spl_array.c:1.71.2.17.2.15  Mon Dec 31 07:20:11 2007
+++ php-src/ext/spl/spl_array.c Mon Jul  7 00:02:22 2008
@@ -16,7 +16,7 @@
    +----------------------------------------------------------------------+
  */
 
-/* $Id: spl_array.c,v 1.71.2.17.2.15 2007/12/31 07:20:11 sebastian Exp $ */
+/* $Id: spl_array.c,v 1.71.2.17.2.16 2008/07/07 00:02:22 colder Exp $ */
 
 #ifdef HAVE_CONFIG_H
 # include "config.h"
@@ -1190,9 +1190,9 @@
                        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, 2, &tmp, arg TSRMLS_CC);
+               zend_call_method(NULL, NULL, NULL, fname, fname_len, 
return_value_ptr, 2, &tmp, arg TSRMLS_CC);
        } else {
-               zend_call_method(NULL, NULL, NULL, fname, fname_len, 
&return_value, 1, &tmp, NULL TSRMLS_CC);
+               zend_call_method(NULL, NULL, NULL, fname, fname_len, 
return_value_ptr, 1, &tmp, NULL TSRMLS_CC);
        }
 }
 



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