- MFH IteratorIterator::__construct() fixes

diff --git a/ext/spl/spl_iterators.c b/ext/spl/spl_iterators.c
index 27d9d205e18b3a5d963dad0025dc1b355306d782..5871edc9b61cca67a2011f5baa028d679652340d 100755 (executable)
--- a/ext/spl/spl_iterators.c
+++ b/ext/spl/spl_iterators.c
@@ -828,9 +828,11 @@ static INLINE int spl_dual_it_fetch(spl_dual_it_object *intern, int check_more T
 
 static INLINE spl_dual_it_object* spl_dual_it_construct(INTERNAL_FUNCTION_PARAMETERS, zend_class_entry *ce_inner, dual_it_type dit_type)
 {
-       zval                 *zobject, *retval = NULL;
+       zval                 *zobject, *retval;
        spl_dual_it_object   *intern;
        zend_class_entry     *ce;
+       int                   inc_refcount = 1;
+
 
        php_set_error_handling(EH_THROW, U_CLASS_ENTRY(spl_ce_InvalidArgumentException) TSRMLS_CC);
 
@@ -898,8 +900,15 @@ static INLINE spl_dual_it_object* spl_dual_it_construct(INTERNAL_FUNCTION_PARAME
                                        ce = *pce_cast;
                                }
                                if (instanceof_function(ce, U_CLASS_ENTRY(zend_ce_aggregate) TSRMLS_CC)) {
-                                       zobject = zend_call_method_with_0_params(&zobject, ce, &ce->iterator_funcs.zf_new_iterator, "getiterator", &retval);
+                                       zend_call_method_with_0_params(&zobject, ce, &ce->iterator_funcs.zf_new_iterator, "getiterator", &retval);
+                                       if (!retval || Z_TYPE_P(retval) != IS_OBJECT || !instanceof_function(Z_OBJCE_P(retval), U_CLASS_ENTRY(zend_ce_traversable) TSRMLS_CC)) {
+                                               zend_throw_exception_ex(U_CLASS_ENTRY(spl_ce_LogicException), 0 TSRMLS_CC, "%s::getIterator() must return an object that implememnts Traversable", ce->name);
+                                               php_set_error_handling(EH_NORMAL, NULL TSRMLS_CC);
+                                               return NULL;
+                                       }
+                                       zobject = retval;
                                        ce = Z_OBJCE_P(zobject);
+                                       inc_refcount = 0;
                                }
                        }
                        break;
@@ -937,16 +946,14 @@ static INLINE spl_dual_it_object* spl_dual_it_construct(INTERNAL_FUNCTION_PARAME
 
        php_set_error_handling(EH_THROW, zend_exception_get_default(TSRMLS_C) TSRMLS_CC);
 
-       zobject->refcount++;
+       if (inc_refcount) {
+               zobject->refcount++;
+       }
        intern->inner.zobject = zobject;
        intern->inner.ce = dit_type == DIT_IteratorIterator ? ce : Z_OBJCE_P(zobject);
        intern->inner.object = zend_object_store_get_object(zobject TSRMLS_CC);
        intern->inner.iterator = intern->inner.ce->get_iterator(intern->inner.ce, zobject TSRMLS_CC);
 
-       if (retval) {
-               zval_ptr_dtor(&retval);
-       }
-       
        php_set_error_handling(EH_NORMAL, NULL TSRMLS_CC);
        return intern;
 }