diff --git a/ext/spl/spl_iterators.c b/ext/spl/spl_iterators.c index 63dcd008552..19a68f6372f 100755 --- a/ext/spl/spl_iterators.c +++ b/ext/spl/spl_iterators.c @@ -1382,31 +1382,12 @@ static spl_dual_it_object* spl_dual_it_construct(INTERNAL_FUNCTION_PARAMETERS, z intern->dit_type = dit_type; switch (dit_type) { case DIT_LimitIterator: { - zval *tmp_offset, *tmp_count; intern->u.limit.offset = 0; /* start at beginning */ intern->u.limit.count = -1; /* get all */ - if (zend_parse_parameters(ZEND_NUM_ARGS() TSRMLS_CC, "O|zz", &zobject, ce_inner, &tmp_offset, &tmp_count) == FAILURE) { + if (zend_parse_parameters(ZEND_NUM_ARGS() TSRMLS_CC, "O|ll", &zobject, ce_inner, &intern->u.limit.offset, &intern->u.limit.count) == FAILURE) { zend_restore_error_handling(&error_handling TSRMLS_CC); return NULL; } - if (tmp_offset && Z_TYPE_P(tmp_offset) != IS_NULL) { - if (Z_TYPE_P(tmp_offset) != IS_LONG) { - zend_throw_exception(spl_ce_OutOfRangeException, "offset param must be of type int", 0 TSRMLS_CC); - zend_restore_error_handling(&error_handling TSRMLS_CC); - return NULL; - } else { - intern->u.limit.offset = Z_LVAL_P(tmp_offset); - } - } - if (tmp_count && Z_TYPE_P(tmp_count) != IS_NULL) { - if (Z_TYPE_P(tmp_count) != IS_LONG) { - zend_throw_exception(spl_ce_OutOfRangeException, "count param must be of type int", 0 TSRMLS_CC); - zend_restore_error_handling(&error_handling TSRMLS_CC); - return NULL; - } else { - intern->u.limit.count = Z_LVAL_P(tmp_count); - } - } if (intern->u.limit.offset < 0) { zend_throw_exception(spl_ce_OutOfRangeException, "Parameter offset must be >= 0", 0 TSRMLS_CC); zend_restore_error_handling(&error_handling TSRMLS_CC); diff --git a/ext/spl/spl_iterators.h b/ext/spl/spl_iterators.h index 6be00798e51..4a2c999c30c 100755 --- a/ext/spl/spl_iterators.h +++ b/ext/spl/spl_iterators.h @@ -137,7 +137,7 @@ typedef struct _spl_dual_it_object { uint str_key_len; ulong int_key; int key_type; /* HASH_KEY_IS_STRING or HASH_KEY_IS_LONG */ - long pos; + int pos; } current; dual_it_type dit_type; union { diff --git a/ext/spl/tests/bug62477_1.phpt b/ext/spl/tests/bug62477_1.phpt deleted file mode 100644 index 1b768a741b0..00000000000 --- a/ext/spl/tests/bug62477_1.phpt +++ /dev/null @@ -1,12 +0,0 @@ ---TEST-- -Bug #62477 LimitIterator int overflow when float is passed (1) ---FILE-- -__construct(Object(ArrayIterator), %f) -#1 {main} - thrown in %sbug62477_1.php on line %d diff --git a/ext/spl/tests/bug62477_2.phpt b/ext/spl/tests/bug62477_2.phpt deleted file mode 100644 index aa3468a3977..00000000000 --- a/ext/spl/tests/bug62477_2.phpt +++ /dev/null @@ -1,12 +0,0 @@ ---TEST-- -Bug #62477 LimitIterator int overflow when float is passed (2) ---FILE-- -__construct(Object(ArrayIterator), 0, %f) -#1 {main} - thrown in %sbug62477_2.php on line %d