diff options
| author | Jakub Zelenka <bukka@php.net> | 2016-06-19 17:05:48 +0100 |
|---|---|---|
| committer | Jakub Zelenka <bukka@php.net> | 2016-06-19 17:05:48 +0100 |
| commit | e63a8540a60e95aa5bd8e269add1b02afcc1b79b (patch) | |
| tree | b83a144eec24cc81adab0b9a778f7a730d8df79e /Zend/zend_iterators.c | |
| parent | 7a4cc73641bb3eb878f7184bcbd026ee663cf2a9 (diff) | |
| parent | 53071e647049f099f7f7a0771ddb63fc2cdd621c (diff) | |
| download | php-git-e63a8540a60e95aa5bd8e269add1b02afcc1b79b.tar.gz | |
Merge branch 'openssl_error_store' into openssl_aead
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; |