diff options
| author | Jakub Zelenka <bukka@php.net> | 2016-06-19 16:20:02 +0100 |
|---|---|---|
| committer | Jakub Zelenka <bukka@php.net> | 2016-06-19 16:20:02 +0100 |
| commit | c2b90805e81de43b4fa28fa1b30ed255bfba76b2 (patch) | |
| tree | a353bb7b1cb958fd4f3e576ab44f3b6ef03a02c2 /Zend/zend_iterators.c | |
| parent | b44cf1a8540d321583a0d83ebca688ebab10d3b0 (diff) | |
| parent | d0e84c6f4702dc5dda473851dd33c5e6cee82ee6 (diff) | |
| download | php-git-c2b90805e81de43b4fa28fa1b30ed255bfba76b2.tar.gz | |
Merge branch 'master' into openssl_error_store
Diffstat (limited to 'Zend/zend_iterators.c')
| -rw-r--r-- | Zend/zend_iterators.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/Zend/zend_iterators.c b/Zend/zend_iterators.c index 2f5a23e0f0..b08fc24831 100644 --- a/Zend/zend_iterators.c +++ b/Zend/zend_iterators.c @@ -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; |