mirrors/php-src
0
0
Fork 0
mirror of https://github.com/php/php-src.git synced 2025-01-10 13:03:54 +08:00
Code Issues Packages Projects Releases Wiki Activity

Fix bug #48206 - Iterating over an invalid data structure leads to a segfault

Browse Source
This commit is contained in:
Scott MacVicar 2009-05-09 19:37:34 +00:00
parent 08ce133aca
commit 433a7c6f58
1 changed files with 17 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

21
ext/spl/spl_iterators.c
View File

@ -929,8 +929,9 @@ static void spl_recursive_tree_iterator_get_entry(spl_recursive_it_object * obje
iterator->funcs->get_current_data(iterator, &data TSRMLS_CC); iterator->funcs->get_current_data(iterator, &data TSRMLS_CC);
zend_replace_error_handling(EH_THROW, spl_ce_UnexpectedValueException, &error_handling TSRMLS_CC); zend_replace_error_handling(EH_THROW, spl_ce_UnexpectedValueException, &error_handling TSRMLS_CC);
if (data && *data) {
RETVAL_ZVAL(*data, 1, 0); RETVAL_ZVAL(*data, 1, 0);
}
if (Z_TYPE_P(return_value) == IS_ARRAY) { if (Z_TYPE_P(return_value) == IS_ARRAY) {
zval_dtor(return_value); zval_dtor(return_value);
ZVAL_STRINGL(return_value, "Array", sizeof("Array")-1, 1); ZVAL_STRINGL(return_value, "Array", sizeof("Array")-1, 1);
@ -1017,7 +1018,11 @@ SPL_METHOD(RecursiveTreeIterator, current)
zval **data; zval **data;
iterator->funcs->get_current_data(iterator, &data TSRMLS_CC); iterator->funcs->get_current_data(iterator, &data TSRMLS_CC);
RETURN_ZVAL(*data, 1, 0); if (data && *data) {
RETURN_ZVAL(*data, 1, 0);
} else {
RETURN_NULL();
}
} }
spl_recursive_tree_iterator_get_entry(object, &entry TSRMLS_CC); spl_recursive_tree_iterator_get_entry(object, &entry TSRMLS_CC);
@ -2806,7 +2811,9 @@ SPL_METHOD(NoRewindIterator, current)
intern = (spl_dual_it_object*)zend_object_store_get_object(getThis() TSRMLS_CC); intern = (spl_dual_it_object*)zend_object_store_get_object(getThis() TSRMLS_CC);
intern->inner.iterator->funcs->get_current_data(intern->inner.iterator, &data TSRMLS_CC); intern->inner.iterator->funcs->get_current_data(intern->inner.iterator, &data TSRMLS_CC);
RETURN_ZVAL(*data, 1, 0); if (data && *data) {
RETURN_ZVAL(*data, 1, 0);
}
} /* }}} */ } /* }}} */
/* {{{ proto void NoRewindIterator::next() U /* {{{ proto void NoRewindIterator::next() U
@ -3118,6 +3125,9 @@ static int spl_iterator_to_array_apply(zend_object_iterator *iter, void *puser T
if (EG(exception)) { if (EG(exception)) {
return ZEND_HASH_APPLY_STOP; return ZEND_HASH_APPLY_STOP;
} }
if (data == NULL || *data == NULL) {
return ZEND_HASH_APPLY_STOP;
}
if (iter->funcs->get_current_key) { if (iter->funcs->get_current_key) {
key_type = iter->funcs->get_current_key(iter, &str_key, &str_key_len, &int_key TSRMLS_CC); key_type = iter->funcs->get_current_key(iter, &str_key, &str_key_len, &int_key TSRMLS_CC);
if (EG(exception)) { if (EG(exception)) {
@ -3153,6 +3163,9 @@ static int spl_iterator_to_values_apply(zend_object_iterator *iter, void *puser
if (EG(exception)) { if (EG(exception)) {
return ZEND_HASH_APPLY_STOP; return ZEND_HASH_APPLY_STOP;
} }
if (data == NULL || *data == NULL) {
return ZEND_HASH_APPLY_STOP;
}
Z_ADDREF_PP(data); Z_ADDREF_PP(data);
add_next_index_zval(return_value, *data); add_next_index_zval(return_value, *data);
return ZEND_HASH_APPLY_KEEP; return ZEND_HASH_APPLY_KEEP;