]> granicus.if.org Git - php/commitdiff
Replaced wrong check with proper ZEND_ASSERT()
authorDmitry Stogov <dmitry@zend.com>
Wed, 8 Jun 2016 09:11:47 +0000 (12:11 +0300)
committerDmitry Stogov <dmitry@zend.com>
Wed, 8 Jun 2016 09:11:47 +0000 (12:11 +0300)
Zend/zend_iterators.c

index 2f5a23e0f006fb8e4ba28709c354429f7d1bd9dd..b08fc248312abeab04a2113f7d6c1a67b3af8c2d 100644 (file)
@@ -90,8 +90,8 @@ ZEND_API void zend_iterator_dtor(zend_object_iterator *iter)
 
 ZEND_API zend_object_iterator* zend_iterator_unwrap(zval *array_ptr)
 {
-       if (Z_TYPE_P(array_ptr) &&
-           Z_OBJ_HT_P(array_ptr) == &iterator_object_handlers) {
+       ZEND_ASSERT(Z_TYPE_P(array_ptr) == IS_OBJECT);
+       if (Z_OBJ_HT_P(array_ptr) == &iterator_object_handlers) {
                return (zend_object_iterator *)Z_OBJ_P(array_ptr);
        }
        return NULL;