diff options
Diffstat (limited to 'Zend/zend_iterators.c')
| -rw-r--r-- | Zend/zend_iterators.c | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/Zend/zend_iterators.c b/Zend/zend_iterators.c index 1c5ba321de..d0572b25c6 100644 --- a/Zend/zend_iterators.c +++ b/Zend/zend_iterators.c @@ -51,7 +51,7 @@ static zend_object_handlers iterator_object_handlers = { ZEND_API void zend_register_iterator_wrapper(TSRMLS_D) { INIT_CLASS_ENTRY(zend_iterator_class_entry, "__iterator_wrapper", NULL); - free(zend_iterator_class_entry.name); + str_free(zend_iterator_class_entry.name); zend_iterator_class_entry.name = "__iterator_wrapper"; } @@ -82,13 +82,13 @@ ZEND_API enum zend_object_iterator_kind zend_iterator_unwrap( *iter = (zend_object_iterator *)zend_object_store_get_object(array_ptr TSRMLS_CC); return ZEND_ITER_OBJECT; } - if (HASH_OF(array_ptr)) { + if (Z_OBJPROP_P(array_ptr)) { return ZEND_ITER_PLAIN_OBJECT; } return ZEND_ITER_INVALID; case IS_ARRAY: - if (HASH_OF(array_ptr)) { + if (Z_ARRVAL_P(array_ptr)) { return ZEND_ITER_PLAIN_ARRAY; } return ZEND_ITER_INVALID; |