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

[Antony Dovgal]

tony2001                Wed Mar 22 23:12:03 2006 UTC

  Modified files:              (Branch: PHP_5_1)
    /php-src/ext/spl    spl_array.c 
  Log:
  fix leak
  
  
http://cvs.php.net/viewcvs.cgi/php-src/ext/spl/spl_array.c?r1=1.71.2.11&r2=1.71.2.12&diff_format=u
Index: php-src/ext/spl/spl_array.c
diff -u php-src/ext/spl/spl_array.c:1.71.2.11 
php-src/ext/spl/spl_array.c:1.71.2.12
--- php-src/ext/spl/spl_array.c:1.71.2.11       Wed Mar 22 21:56:39 2006
+++ php-src/ext/spl/spl_array.c Wed Mar 22 23:12:03 2006
@@ -16,7 +16,7 @@
    +----------------------------------------------------------------------+
  */
 
-/* $Id: spl_array.c,v 1.71.2.11 2006/03/22 21:56:39 tony2001 Exp $ */
+/* $Id: spl_array.c,v 1.71.2.12 2006/03/22 23:12:03 tony2001 Exp $ */
 
 #ifdef HAVE_CONFIG_H
 # include "config.h"
@@ -260,14 +260,13 @@
                if (intern->fptr_offset_get) {
                        zval *rv;
                        zend_call_method_with_1_params(&object, 
Z_OBJCE_P(object), &intern->fptr_offset_get, "offsetGet", &rv, offset); 
-                       zval_ptr_dtor(&intern->retval);
-                       MAKE_STD_ZVAL(intern->retval);
                        if (rv) {
+                               zval_ptr_dtor(&intern->retval);
+                               MAKE_STD_ZVAL(intern->retval);
                                ZVAL_ZVAL(intern->retval, rv, 1, 1);
-                       } else {
-                               ZVAL_NULL(intern->retval);
+                               return intern->retval;
                        }
-                       return intern->retval;
+                       return EG(uninitialized_zval_ptr);
                }
        }
        return *spl_array_get_dimension_ptr_ptr(check_inherited, object, 
offset, type TSRMLS_CC);


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