php/archived-php-src
1
0
Fork 0
mirror of https://github.com/php/php-src.git synced 2026-04-24 16:38:25 +02:00
Code Issues Packages Projects Releases Wiki Activity

fix #37416 (iterator_to_array() hides exceptions thrown in rewind() method)

Browse Source
This commit is contained in:
Antony Dovgal
2006-05-12 09:42:19 +00:00
parent 058ddb8f65
commit d5c7ea7733
1 changed files with 27 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files
ext/spl/spl_iterators.c
+27
View File
@@ -2400,11 +2400,20 @@ PHP_FUNCTION(iterator_to_array)
if (iter->funcs->rewind) {
iter->funcs->rewind(iter TSRMLS_CC);
}
if (EG(exception)) {
return;
}
while (iter->funcs->valid(iter TSRMLS_CC) == SUCCESS) {
iter->funcs->get_current_data(iter, &data TSRMLS_CC);
if (EG(exception)) {
return;
}
(*data)->refcount++;
if (iter->funcs->get_current_key) {
key_type = iter->funcs->get_current_key(iter, &str_key, &str_key_len, &int_key TSRMLS_CC);
if (EG(exception)) {
return;
}
switch(key_type) {
case HASH_KEY_IS_STRING:
add_assoc_zval_ex(return_value, str_key.s, str_key_len, *data);
@@ -2422,8 +2431,14 @@ PHP_FUNCTION(iterator_to_array)
add_next_index_zval(return_value, *data);
}
iter->funcs->move_forward(iter TSRMLS_CC);
if (EG(exception)) {
return;
}
}
iter->funcs->dtor(iter TSRMLS_CC);
if (EG(exception)) {
return;
}
}
/* }}} */
@@ -2444,11 +2459,23 @@ PHP_FUNCTION(iterator_count)
if (iter->funcs->rewind) {
iter->funcs->rewind(iter TSRMLS_CC);
}
if (EG(exception)) {
return;
}
while (iter->funcs->valid(iter TSRMLS_CC) == SUCCESS) {
if (EG(exception)) {
return;
}
count++;
iter->funcs->move_forward(iter TSRMLS_CC);
if (EG(exception)) {
return;
}
}
iter->funcs->dtor(iter TSRMLS_CC);
if (EG(exception)) {
return;
}
RETURN_LONG(count);
}