cvs: php-src /ext/spl spl_array.c

helly Thu Feb 2 22:11:49 2006 UTC Modified files: /php-src/ext/spl spl_array.c Log: - Fix ArrayIterator::seek() edge cases http://cvs.php.net/viewcvs.cgi/php-src/ext/spl/spl_array.c?r1=1.89&r2=1.90&diff_format=u Index: php-src/ext/spl/spl_array.c diff -u php-src/ext/spl/spl_array.c:1.89 php-src/ext/spl/spl_array.c:1.90 --- php-src/ext/spl/spl_array.c:1.89 Tue Jan 17 12:18:52 2006 +++ php-src/ext/spl/spl_array.c Thu Feb 2 22:11:49 2006 @@ -16,7 +16,7 @@ +----------------------------------------------------------------------+ */ -/* $Id: spl_array.c,v 1.89 2006/01/17 12:18:52 dmitry Exp $ */ +/* $Id: spl_array.c,v 1.90 2006/02/02 22:11:49 helly Exp $ */ #ifdef HAVE_CONFIG_H # include "config.h" @@ -1006,15 +1006,12 @@ if (position >= 0) { /* negative values are not supported */ zend_hash_internal_pointer_reset_ex(aht, &intern->pos); + result = SUCCESS; while (position-- > 0 && (result = spl_array_next(intern TSRMLS_CC)) == SUCCESS); - if (intern->pos && (intern->ar_flags & SPL_ARRAY_IS_REF) && spl_hash_verify_pos(intern TSRMLS_CC) == FAILURE) { - /* fail */ - } else { - if (zend_hash_has_more_elements_ex(aht, &intern->pos) == SUCCESS) { - return; /* ok */ - } + if (result == SUCCESS && zend_hash_has_more_elements_ex(aht, &intern->pos) == SUCCESS) { + return; /* ok */ } } zend_throw_exception_ex(U_CLASS_ENTRY(spl_ce_OutOfBoundsException), 0 TSRMLS_CC, "Seek position %ld is out of range", opos);