cvs: php-src(PHP_5_0) / NEWS /ext/spl spl_iterators.c /ext/spl/tests bug31348.phpt

From: Date: Mon, 24 Jan 2005 20:25:59 +0000
Subject: cvs: php-src(PHP_5_0) / NEWS /ext/spl spl_iterators.c /ext/spl/tests bug31348.phpt
Groups: php.cvs 
Request: Send a blank email to php-cvs+get-30108@lists.php.net to get a copy of this message
helly Mon Jan 24 15:25:59 2005 EDT Added files: (Branch: PHP_5_0) /php-src/ext/spl/tests bug31348.phpt Modified files: /php-src NEWS /php-src/ext/spl spl_iterators.c Log: - MFH fix for bug #31348 CachingIterator::rewind() leaks http://cvs.php.net/diff.php/php-src/NEWS?r1=1.1760.2.206&r2=1.1760.2.207&ty=u Index: php-src/NEWS diff -u php-src/NEWS:1.1760.2.206 php-src/NEWS:1.1760.2.207 --- php-src/NEWS:1.1760.2.206 Mon Jan 24 15:04:45 2005 +++ php-src/NEWS Mon Jan 24 15:25:58 2005 @@ -21,6 +21,7 @@ - Fixed bug #31396 (compile fails with gd 2.0.33 without freetype). (Jani) - Fixed bug #31371 (highlight_file() trims new line after heredoc). (Ilia) - Fixed bug #31361 (simplexml/domxml segfault when adding node twice). (Rob) +- Fixed bug #31348 (CachingIterator::rewind() leaks). (Marcus) - Fixed bug #31190 (Unexpected warning then exception is thrown from call_user_func_array()). (phpbugs at domain51 dot net, Dmitry) - Fixed bug #31142 (imap_mail_compose() fails to generate correct output). (Ilia) http://cvs.php.net/diff.php/php-src/ext/spl/spl_iterators.c?r1=1.38.2.7&r2=1.38.2.8&ty=u Index: php-src/ext/spl/spl_iterators.c diff -u php-src/ext/spl/spl_iterators.c:1.38.2.7 php-src/ext/spl/spl_iterators.c:1.38.2.8 --- php-src/ext/spl/spl_iterators.c:1.38.2.7 Wed Dec 29 11:12:55 2004 +++ php-src/ext/spl/spl_iterators.c Mon Jan 24 15:25:58 2005 @@ -16,7 +16,7 @@ +----------------------------------------------------------------------+ */ -/* $Id: spl_iterators.c,v 1.38.2.7 2004/12/29 16:12:55 tony2001 Exp $ */ +/* $Id: spl_iterators.c,v 1.38.2.8 2005/01/24 20:25:58 helly Exp $ */ #ifdef HAVE_CONFIG_H # include "config.h" @@ -1172,6 +1172,7 @@ zval_copy_ctor(intern->u.caching.zstr); zval_dtor(&expr_copy); } else { + INIT_PZVAL(intern->u.caching.zstr); zval_copy_ctor(intern->u.caching.zstr); } } http://cvs.php.net/co.php/php-src/ext/spl/tests/bug31348.phpt?r=1.1&p=1 Index: php-src/ext/spl/tests/bug31348.phpt +++ php-src/ext/spl/tests/bug31348.phpt --TEST-- Bug #31348 (CachingIterator::rewind() leaks) --FILE-- <?php $a = Array("some","blah"); $i = new ArrayIterator($a); $ci = new CachingIterator($i); $ci->rewind(); ?> ===DONE=== --EXPECT-- ===DONE===

« previous php.cvs (#30108) next »