helly Thu Jul 20 22:52:16 2006 UTC
Modified files:
/php-src/ext/spl spl_iterators.c
Log:
- Need to initialized zvals completley
http://cvs.php.net/viewvc.cgi/php-src/ext/spl/spl_iterators.c?r1=1.144&r2=1.145&diff_format=u
Index: php-src/ext/spl/spl_iterators.c
diff -u php-src/ext/spl/spl_iterators.c:1.144
php-src/ext/spl/spl_iterators.c:1.145
--- php-src/ext/spl/spl_iterators.c:1.144 Thu Jul 20 22:35:43 2006
+++ php-src/ext/spl/spl_iterators.c Thu Jul 20 22:52:16 2006
@@ -16,7 +16,7 @@
+----------------------------------------------------------------------+
*/
-/* $Id: spl_iterators.c,v 1.144 2006/07/20 22:35:43 helly Exp $ */
+/* $Id: spl_iterators.c,v 1.145 2006/07/20 22:52:16 helly Exp $ */
#ifdef HAVE_CONFIG_H
# include "config.h"
@@ -1442,7 +1442,7 @@
use_copy = 1;
}
zval_ptr_dtor(&intern->current.data);
- MAKE_STD_ZVAL(intern->current.data);
+ ALLOC_INIT_ZVAL(intern->current.data);
php_pcre_match_impl(intern->u.regex.pce, subject, subject_len,
&zcount,
intern->current.data, intern->u.regex.mode ==
REGIT_MODE_ALL_MATCHES, intern->u.regex.use_flags, intern->u.regex.preg_flags,
0 TSRMLS_CC);
count =
zend_hash_num_elements(Z_ARRVAL_P(intern->current.data));
@@ -1455,7 +1455,7 @@
use_copy = 1;
}
zval_ptr_dtor(&intern->current.data);
- MAKE_STD_ZVAL(intern->current.data);
+ ALLOC_INIT_ZVAL(intern->current.data);
php_pcre_split_impl(intern->u.regex.pce, subject, subject_len,
intern->current.data, -1, intern->u.regex.preg_flags 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
