From: Nikita Popov <nikita.ppv@gmail.com>
Date: Fri, 14 Aug 2020 08:42:14 +0000 (+0200)
Subject: Merge branch 'PHP-7.4'
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=0a439fa93273ea475408d43c9b72c59aa4289000;p=php

Merge branch 'PHP-7.4'

* PHP-7.4:
  Add missing initialization check to RegexIterator::getRegex()
---

0a439fa93273ea475408d43c9b72c59aa4289000
diff --cc ext/spl/spl_iterators.c
index 2410050586,7dd4b29c05..242fcfbfae
--- a/ext/spl/spl_iterators.c
+++ b/ext/spl/spl_iterators.c
@@@ -1896,9 -2096,11 +1896,11 @@@ PHP_METHOD(RegexIterator, getRegex
  	spl_dual_it_object *intern = Z_SPLDUAL_IT_P(ZEND_THIS);
  
  	if (zend_parse_parameters_none() == FAILURE) {
 -		return;
 +		RETURN_THROWS();
  	}
  
+ 	SPL_FETCH_AND_CHECK_DUAL_IT(intern, ZEND_THIS);
+ 
  	RETURN_STR_COPY(intern->u.regex.regex);
  } /* }}} */