diff options
| author | Xinchen Hui <laruence@gmail.com> | 2018-05-23 14:46:32 +0800 |
|---|---|---|
| committer | Xinchen Hui <laruence@gmail.com> | 2018-05-23 14:46:32 +0800 |
| commit | 0aff0548cbfbecd326f98b0ef9d05f4e129a63ce (patch) | |
| tree | c4c9d0668976381af635872cf12de5a9463406fe | |
| parent | 3986b6ab6e754a1054a95d9b6df689cfa7000d62 (diff) | |
| parent | a9d00be0244207d1562a1c31df84a293ff32a64f (diff) | |
| download | php-git-0aff0548cbfbecd326f98b0ef9d05f4e129a63ce.tar.gz | |
Merge branch 'PHP-7.2'
* PHP-7.2:
Update NEWS
Fixed bug #76367 (NoRewindIterator segfault 11)
| -rw-r--r-- | ext/spl/spl_array.c | 2 | ||||
| -rw-r--r-- | ext/spl/tests/bug76367.phpt | 16 |
2 files changed, 17 insertions, 1 deletions
diff --git a/ext/spl/spl_array.c b/ext/spl/spl_array.c index ad4d13815b..ec6d7d5fb1 100644 --- a/ext/spl/spl_array.c +++ b/ext/spl/spl_array.c @@ -1035,7 +1035,7 @@ static zval *spl_array_it_get_current_data(zend_object_iterator *iter) /* {{{ */ return zend_user_it_get_current_data(iter); } else { zval *data = zend_hash_get_current_data_ex(aht, spl_array_get_pos_ptr(aht, object)); - if (Z_TYPE_P(data) == IS_INDIRECT) { + if (data && Z_TYPE_P(data) == IS_INDIRECT) { data = Z_INDIRECT_P(data); } return data; diff --git a/ext/spl/tests/bug76367.phpt b/ext/spl/tests/bug76367.phpt new file mode 100644 index 0000000000..f34e8a39de --- /dev/null +++ b/ext/spl/tests/bug76367.phpt @@ -0,0 +1,16 @@ +--TEST-- +Bug #76367 (NoRewindIterator segfault 11) +--FILE-- +<?php +$arr = [1,3,55,66,43,6]; + +$iter = new NoRewindIterator(new ArrayIterator($arr)); + +while($iter->valid()) { + $iter->next(); +} + +var_dump($iter->current()); +?> +--EXPECT-- +NULL |