From: Marcus Boerger Date: Sat, 12 Mar 2005 23:12:36 +0000 (+0000) Subject: - Partly MFH: return value check fix X-Git-Tag: php-5.0.4RC1~6 X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=7256d2ca6a632faad6b7e0795572d2d5cd8f31e9;p=php - Partly MFH: return value check fix --- diff --git a/ext/spl/spl_iterators.c b/ext/spl/spl_iterators.c index 87910bcb91..44ef7fef82 100755 --- a/ext/spl/spl_iterators.c +++ b/ext/spl/spl_iterators.c @@ -233,7 +233,7 @@ next_step: ce = object->iterators[object->level].ce; zobject = object->iterators[object->level].zobject; zend_call_method_with_0_params(&zobject, ce, NULL, "getchildren", &child); - ce = child ? Z_OBJCE_P(child) : NULL; + ce = child && Z_TYPE_P(child) == IS_OBJECT ? Z_OBJCE_P(child) : NULL; if (!ce || !instanceof_function(ce, spl_ce_RecursiveIterator TSRMLS_CC)) { if (child) { zval_ptr_dtor(&child);