colder Fri, 12 Aug 2011 22:20:35 +0000 Revision: http://svn.php.net/viewvc?view=revision&revision=314855
Log: Fix CID 593 Mark the missing break by an explicit comment, we DO intend to fall through here Changed paths: U php/php-src/branches/PHP_5_4/ext/spl/spl_iterators.c U php/php-src/trunk/ext/spl/spl_iterators.c Modified: php/php-src/branches/PHP_5_4/ext/spl/spl_iterators.c =================================================================== --- php/php-src/branches/PHP_5_4/ext/spl/spl_iterators.c 2011-08-12 22:05:10 UTC (rev 314854) +++ php/php-src/branches/PHP_5_4/ext/spl/spl_iterators.c 2011-08-12 22:20:35 UTC (rev 314855) @@ -214,11 +214,12 @@ zend_clear_exception(TSRMLS_C); } } + /* fall through */ case RS_START: if (iterator->funcs->valid(iterator TSRMLS_CC) == FAILURE) { break; } - object->iterators[object->level].state = RS_TEST; + object->iterators[object->level].state = RS_TEST; /* break; */ case RS_TEST: ce = object->iterators[object->level].ce; Modified: php/php-src/trunk/ext/spl/spl_iterators.c =================================================================== --- php/php-src/trunk/ext/spl/spl_iterators.c 2011-08-12 22:05:10 UTC (rev 314854) +++ php/php-src/trunk/ext/spl/spl_iterators.c 2011-08-12 22:20:35 UTC (rev 314855) @@ -214,6 +214,7 @@ zend_clear_exception(TSRMLS_C); } } + /* fall through */ case RS_START: if (iterator->funcs->valid(iterator TSRMLS_CC) == FAILURE) { break;
-- PHP CVS Mailing List (http://www.php.net/) To unsubscribe, visit: http://www.php.net/unsub.php