colder Sun Oct 19 18:00:24 2008 UTC Modified files: (Branch: PHP_5_3) /php-src/ext/spl spl_array.c /php-src/ext/spl/tests arrayObject___construct_error1.phpt arrayObject_setIteratorClass_error1.phpt Log: Fix #46317 (Iterator class not properly checked) http://cvs.php.net/viewvc.cgi/php-src/ext/spl/spl_array.c?r1=1.71.2.17.2.13.2.28&r2=1.71.2.17.2.13.2.29&diff_format=u Index: php-src/ext/spl/spl_array.c diff -u php-src/ext/spl/spl_array.c:1.71.2.17.2.13.2.28 php-src/ext/spl/spl_array.c:1.71.2.17.2.13.2.29 --- php-src/ext/spl/spl_array.c:1.71.2.17.2.13.2.28 Fri Oct 17 22:09:44 2008 +++ php-src/ext/spl/spl_array.c Sun Oct 19 18:00:24 2008 @@ -16,7 +16,7 @@ +----------------------------------------------------------------------+ */ -/* $Id: spl_array.c,v 1.71.2.17.2.13.2.28 2008/10/17 22:09:44 tony2001 Exp $ */ +/* $Id: spl_array.c,v 1.71.2.17.2.13.2.29 2008/10/19 18:00:24 colder Exp $ */ #ifdef HAVE_CONFIG_H # include "config.h" @@ -1009,9 +1009,7 @@ spl_array_object *intern; zval **array; long ar_flags = 0; - char *class_name; - int class_name_len; - zend_class_entry ** pce_get_iterator; + zend_class_entry *ce_get_iterator = spl_ce_Iterator; if (ZEND_NUM_ARGS() == 0) { return; /* nothing to do */ @@ -1021,16 +1019,12 @@ 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; } if (ZEND_NUM_ARGS() > 2) { - if (zend_lookup_class(class_name, class_name_len, &pce_get_iterator TSRMLS_CC) == FAILURE) { - 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; + intern->ce_get_iterator = ce_get_iterator; } ar_flags &= ~SPL_ARRAY_INT_MASK; @@ -1046,19 +1040,13 @@ { zval *object = getThis(); spl_array_object *intern = (spl_array_object*)zend_object_store_get_object(object TSRMLS_CC); - char *class_name; - int class_name_len; - zend_class_entry ** pce_get_iterator; + zend_class_entry * ce_get_iterator = spl_ce_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; } - if (zend_lookup_class(class_name, class_name_len, &pce_get_iterator TSRMLS_CC) == FAILURE) { - 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; + intern->ce_get_iterator = ce_get_iterator; } /* }}} */ http://cvs.php.net/viewvc.cgi/php-src/ext/spl/tests/arrayObject___construct_error1.phpt?r1=1.1.4.2&r2=1.1.4.3&diff_format=u Index: php-src/ext/spl/tests/arrayObject___construct_error1.phpt diff -u php-src/ext/spl/tests/arrayObject___construct_error1.phpt:1.1.4.2 php-src/ext/spl/tests/arrayObject___construct_error1.phpt:1.1.4.3 --- php-src/ext/spl/tests/arrayObject___construct_error1.phpt:1.1.4.2 Fri Oct 17 14:34:55 2008 +++ php-src/ext/spl/tests/arrayObject___construct_error1.phpt Sun Oct 19 18:00:24 2008 @@ -1,7 +1,5 @@ --TEST-- SPL: ArrayObject::__construct with bad iterator. ---XFAIL-- -See bug http://bugs.php.net/bug.php?id=46317 --FILE-- <?php echo "Bad iterator type:\n"; http://cvs.php.net/viewvc.cgi/php-src/ext/spl/tests/arrayObject_setIteratorClass_error1.phpt?r1=1.1.4.2&r2=1.1.4.3&diff_format=u Index: php-src/ext/spl/tests/arrayObject_setIteratorClass_error1.phpt diff -u php-src/ext/spl/tests/arrayObject_setIteratorClass_error1.phpt:1.1.4.2 php-src/ext/spl/tests/arrayObject_setIteratorClass_error1.phpt:1.1.4.3 --- php-src/ext/spl/tests/arrayObject_setIteratorClass_error1.phpt:1.1.4.2 Fri Oct 17 14:34:55 2008 +++ php-src/ext/spl/tests/arrayObject_setIteratorClass_error1.phpt Sun Oct 19 18:00:24 2008 @@ -1,7 +1,5 @@ --TEST-- SPL: ArrayObject with bad iterator class. ---XFAIL-- -Expected to fail on PHP5 - see http://bugs.php.net/bug.php?id=46317. --FILE-- <?php try {
-- PHP CVS Mailing List (http://www.php.net/) To unsubscribe, visit: http://www.php.net/unsub.php