helly Mon Dec 19 00:45:28 2005 EDT
Modified files: (Branch: PHP_5_1)
/php-src/ext/spl spl_iterators.c
Log:
- Check for result of getIterator() call
http://cvs.php.net/viewcvs.cgi/php-src/ext/spl/spl_iterators.c?r1=1.73.2.10&r2=1.73.2.11&diff_format=u
Index: php-src/ext/spl/spl_iterators.c
diff -u php-src/ext/spl/spl_iterators.c:1.73.2.10
php-src/ext/spl/spl_iterators.c:1.73.2.11
--- php-src/ext/spl/spl_iterators.c:1.73.2.10 Mon Dec 19 00:32:51 2005
+++ php-src/ext/spl/spl_iterators.c Mon Dec 19 00:45:28 2005
@@ -16,7 +16,7 @@
+----------------------------------------------------------------------+
*/
-/* $Id: spl_iterators.c,v 1.73.2.10 2005/12/19 00:32:51 helly Exp $ */
+/* $Id: spl_iterators.c,v 1.73.2.11 2005/12/19 00:45:28 helly Exp $ */
#ifdef HAVE_CONFIG_H
# include "config.h"
@@ -814,7 +814,7 @@
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;
@@ -883,7 +883,13 @@
ce = *pce_cast;
}
if (instanceof_function(ce, 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), zend_ce_traversable
TSRMLS_CC)) {
+
zend_throw_exception_ex(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;
}
--
PHP CVS Mailing List (http://www.php.net/)
To unsubscribe, visit: http://www.php.net/unsub.php
