diff options
author | Nikita Popov <nikita.ppv@gmail.com> | 2020-08-14 10:42:14 +0200 |
---|---|---|
committer | Nikita Popov <nikita.ppv@gmail.com> | 2020-08-14 10:42:14 +0200 |
commit | 0a439fa93273ea475408d43c9b72c59aa4289000 (patch) | |
tree | e1be4dc3d1fd1b9105e9b99ed8d42570b25367ad | |
parent | 964f66942c190715fa7c6fe280ace0f4b9fcbd9d (diff) | |
parent | a0c231c0f5b99e326d3082e67fe8bcd49ac09cb4 (diff) | |
download | php-git-0a439fa93273ea475408d43c9b72c59aa4289000.tar.gz |
Merge branch 'PHP-7.4'
* PHP-7.4:
Add missing initialization check to RegexIterator::getRegex()
-rw-r--r-- | ext/spl/spl_iterators.c | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/ext/spl/spl_iterators.c b/ext/spl/spl_iterators.c index 2410050586..242fcfbfae 100644 --- a/ext/spl/spl_iterators.c +++ b/ext/spl/spl_iterators.c @@ -1899,6 +1899,8 @@ PHP_METHOD(RegexIterator, getRegex) RETURN_THROWS(); } + SPL_FETCH_AND_CHECK_DUAL_IT(intern, ZEND_THIS); + RETURN_STR_COPY(intern->u.regex.regex); } /* }}} */ |