MFB: Fix #46317 (Iterator class not properly checked)

diff --git a/ext/spl/spl_array.c b/ext/spl/spl_array.c
index 2760ceaaceee3679e90ae9139f1a4b4f88cecd93..5e70473bc28d6ecaaf292740e59086b9b6c07f5e 100755 (executable)
--- a/ext/spl/spl_array.c
+++ b/ext/spl/spl_array.c
@@ -910,9 +910,7 @@ SPL_METHOD(Array, __construct)
        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 */
@@ -921,7 +919,7 @@ SPL_METHOD(Array, __construct)
 
        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) {
                php_set_error_handling(EH_NORMAL, NULL TSRMLS_CC);
                return;
        }
@@ -931,12 +929,7 @@ SPL_METHOD(Array, __construct)
        }
 
        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);
-                       php_set_error_handling(EH_NORMAL, NULL TSRMLS_CC);
-                       return;
-               }
-               intern->ce_get_iterator = *pce_get_iterator;
+               intern->ce_get_iterator = ce_get_iterator;
        }
 
        ar_flags &= ~SPL_ARRAY_INT_MASK;
@@ -989,21 +982,14 @@ SPL_METHOD(Array, setIteratorClass)
 {
        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) {
                php_set_error_handling(EH_NORMAL, NULL TSRMLS_CC);
                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);
-               php_set_error_handling(EH_NORMAL, NULL TSRMLS_CC);
-               return;
-       }
-       intern->ce_get_iterator = *pce_get_iterator;
+       intern->ce_get_iterator = ce_get_iterator;
 }
 /* }}} */
 

diff --git a/ext/spl/tests/arrayObject___construct_error1.phpt b/ext/spl/tests/arrayObject___construct_error1.phpt
index 789b08763c8de10602ca6ad7ab8bfe8aad22e376..21c312d2d0bff07af3753ab6f014633b59622073 100644 (file)
--- a/ext/spl/tests/arrayObject___construct_error1.phpt
+++ b/ext/spl/tests/arrayObject___construct_error1.phpt
@@ -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";

diff --git a/ext/spl/tests/arrayObject_setIteratorClass_error1.phpt b/ext/spl/tests/arrayObject_setIteratorClass_error1.phpt
index 816f092d413900a09ef72eef30c3a72d786a5876..61b1073955ca6fd9fb4e2918f12ccbd6f7f03856 100644 (file)
--- a/ext/spl/tests/arrayObject_setIteratorClass_error1.phpt
+++ b/ext/spl/tests/arrayObject_setIteratorClass_error1.phpt
@@ -1,7 +1,5 @@
 --TEST--
 SPL: ArrayObject::setIteratorClass with bad iterator class.
---XFAIL--
-See bug http://bugs.php.net/bug.php?id=46317
 --FILE--
 <?php
 try {
@@ -56,4 +54,4 @@ Warning: ArrayObject::setIteratorClass() expects parameter 1 to be a class name
   b=>2
   c=>3
 string(113) "ArrayObject::__construct() expects parameter 3 to be a class name derived from Iterator, 'nonExistentClass' given"
-string(105) "ArrayObject::__construct() expects parameter 3 to be a class name derived from Iterator, 'stdClass' given"
\ No newline at end of file
+string(105) "ArrayObject::__construct() expects parameter 3 to be a class name derived from Iterator, 'stdClass' given"