cvs: php-src(PHP_5_3) /ext/spl spl_iterators.c

scottmac Sat May 9 19:45:26 2009 UTC Modified files: (Branch: PHP_5_3) /php-src/ext/spl spl_iterators.c Log: Fix bug #48206 again http://cvs.php.net/viewvc.cgi/php-src/ext/spl/spl_iterators.c?r1=1.73.2.30.2.28.2.23&r2=1.73.2.30.2.28.2.24&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.28.2.23 php-src/ext/spl/spl_iterators.c:1.73.2.30.2.28.2.24 --- php-src/ext/spl/spl_iterators.c:1.73.2.30.2.28.2.23 Sat May 9 19:35:09 2009 +++ php-src/ext/spl/spl_iterators.c Sat May 9 19:45:26 2009 @@ -16,7 +16,7 @@ +----------------------------------------------------------------------+ */ -/* $Id: spl_iterators.c,v 1.73.2.30.2.28.2.23 2009/05/09 19:35:09 scottmac Exp $ */ +/* $Id: spl_iterators.c,v 1.73.2.30.2.28.2.24 2009/05/09 19:45:26 scottmac Exp $ */ #ifdef HAVE_CONFIG_H # include "config.h" @@ -596,7 +596,9 @@ zval **data; iterator->funcs->get_current_data(iterator, &data TSRMLS_CC); - RETURN_ZVAL(*data, 1, 0); + if (data && *data) { + RETURN_ZVAL(*data, 1, 0); + } } /* }}} */ /* {{{ proto void RecursiveIteratorIterator::next()