archive/php-src
1
0
Fork 0
mirror of https://github.com/php/php-src.git synced 2025-08-18 06:58:55 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions 1

Fix #46317 (Iterator class not properly checked)

Browse source
This commit is contained in:
Etienne Kneuss 2008-10-19 18:00:24 +00:00
parent c8361e7cfe
commit 1a642296ba
3 changed files with 6 additions and 22 deletions
Download patch file Download diff file Expand all files Collapse all files

24
ext/spl/spl_array.c
View file

@ -1009,9 +1009,7 @@ SPL_METHOD(Array, __construct)
spl_array_object *intern; spl_array_object *intern;
zval **array; zval **array;
long ar_flags = 0; long ar_flags = 0;
char *class_name; zend_class_entry *ce_get_iterator = spl_ce_Iterator;
int class_name_len;
zend_class_entry ** pce_get_iterator;
if (ZEND_NUM_ARGS() == 0) { if (ZEND_NUM_ARGS() == 0) {
return; /* nothing to do */ return; /* nothing to do */
@ -1021,16 +1019,12 @@ SPL_METHOD(Array, __construct)
intern = (spl_array_object*)zend_object_store_get_object(object TSRMLS_CC); intern = (spl_array_object*)zend_object_store_get_object(object TSRMLS_CC);
if (zend_parse_parameters(ZEND_NUM_ARGS() TSRMLS_CC, "Z|ls", &array, &ar_flags, &class_name, &class_name_len) == FAILURE) { if (zend_parse_parameters(ZEND_NUM_ARGS() TSRMLS_CC, "Z|lC", &array, &ar_flags, &ce_get_iterator) == FAILURE) {
return; return;
} }
if (ZEND_NUM_ARGS() > 2) { if (ZEND_NUM_ARGS() > 2) {
if (zend_lookup_class(class_name, class_name_len, &pce_get_iterator TSRMLS_CC) == FAILURE) { intern->ce_get_iterator = ce_get_iterator;
zend_throw_exception(spl_ce_InvalidArgumentException, "A class that implements Iterator must be specified", 0 TSRMLS_CC);
return;
}
intern->ce_get_iterator = *pce_get_iterator;
} }
ar_flags &= ~SPL_ARRAY_INT_MASK; ar_flags &= ~SPL_ARRAY_INT_MASK;
@ -1046,19 +1040,13 @@ SPL_METHOD(Array, setIteratorClass)
{ {
zval *object = getThis(); zval *object = getThis();
spl_array_object *intern = (spl_array_object*)zend_object_store_get_object(object TSRMLS_CC); spl_array_object *intern = (spl_array_object*)zend_object_store_get_object(object TSRMLS_CC);
char *class_name; zend_class_entry * ce_get_iterator = spl_ce_Iterator;
int class_name_len;
zend_class_entry ** pce_get_iterator;
if (zend_parse_parameters(ZEND_NUM_ARGS() TSRMLS_CC, "s", &class_name, &class_name_len) == FAILURE) { if (zend_parse_parameters(ZEND_NUM_ARGS() TSRMLS_CC, "C", &ce_get_iterator) == FAILURE) {
return; return;
} }
if (zend_lookup_class(class_name, class_name_len, &pce_get_iterator TSRMLS_CC) == FAILURE) { intern->ce_get_iterator = ce_get_iterator;
zend_throw_exception(spl_ce_InvalidArgumentException, "A class that implements Iterator must be specified", 0 TSRMLS_CC);
return;
}
intern->ce_get_iterator = *pce_get_iterator;
} }
/* }}} */ /* }}} */

2
ext/spl/tests/arrayObject___construct_error1.phpt
View file

@ -1,7 +1,5 @@
--TEST-- --TEST--
SPL: ArrayObject::__construct with bad iterator. SPL: ArrayObject::__construct with bad iterator.
--XFAIL--
See bug http://bugs.php.net/bug.php?id=46317
--FILE-- --FILE--
<?php <?php
echo "Bad iterator type:\n"; echo "Bad iterator type:\n";

2
ext/spl/tests/arrayObject_setIteratorClass_error1.phpt
View file

@ -1,7 +1,5 @@
--TEST-- --TEST--
SPL: ArrayObject with bad iterator class. SPL: ArrayObject with bad iterator class.
--XFAIL--
Expected to fail on PHP5 - see http://bugs.php.net/bug.php?id=46317.
--FILE-- --FILE--
<?php <?php
try { try {