iliaa Tue Jul 18 22:42:28 2006 UTC
Modified files: (Branch: PHP_5_2)
/php-src/ext/spl spl_iterators.c
Log:
Fixed memory leak
http://cvs.php.net/viewvc.cgi/php-src/ext/spl/spl_iterators.c?r1=1.73.2.30.2.13&r2=1.73.2.30.2.14&diff_format=u
Index: php-src/ext/spl/spl_iterators.c
diff -u php-src/ext/spl/spl_iterators.c:1.73.2.30.2.13
php-src/ext/spl/spl_iterators.c:1.73.2.30.2.14
--- php-src/ext/spl/spl_iterators.c:1.73.2.30.2.13 Mon Jul 17 21:11:32 2006
+++ php-src/ext/spl/spl_iterators.c Tue Jul 18 22:42:28 2006
@@ -16,7 +16,7 @@
+----------------------------------------------------------------------+
*/
-/* $Id: spl_iterators.c,v 1.73.2.30.2.13 2006/07/17 21:11:32 helly Exp $ */
+/* $Id: spl_iterators.c,v 1.73.2.30.2.14 2006/07/18 22:42:28 iliaa Exp $ */
#ifdef HAVE_CONFIG_H
# include "config.h"
@@ -1420,7 +1420,6 @@
}
zval_ptr_dtor(&intern->current.data);
MAKE_STD_ZVAL(intern->current.data);
- array_init(intern->current.data);
php_pcre_match(regex, extra, subject, subject_len, &zcount,
intern->current.data, intern->u.regex.mode ==
REGIT_MODE_ALL_MATCHES, 0, 0, 0, 0 TSRMLS_CC);
count =
zend_hash_num_elements(Z_ARRVAL_P(intern->current.data));
@@ -1434,7 +1433,6 @@
}
zval_ptr_dtor(&intern->current.data);
MAKE_STD_ZVAL(intern->current.data);
- array_init(intern->current.data);
php_pcre_split(regex, extra, subject, subject_len,
intern->current.data, 0, -1, 0, 0, 0 TSRMLS_CC);
count =
zend_hash_num_elements(Z_ARRVAL_P(intern->current.data));
RETVAL_BOOL(count > 1);
--
PHP CVS Mailing List (http://www.php.net/)
To unsubscribe, visit: http://www.php.net/unsub.php
