Merge branch 'PHP-7.4'

nikic · nikic · commit 0a439fa93273 · 2020-08-14T10:42:14.000+02:00
* PHP-7.4:
  Add missing initialization check to RegexIterator::getRegex()
diff --git 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);
 } /* }}} */
 

Original file line number	Diff line number	Diff line change
`@@ -1899,6 +1899,8 @@ PHP_METHOD(RegexIterator, getRegex)`
`1899`	`1899`	`RETURN_THROWS();`
`1900`	`1900`	`}`
`1901`	`1901`
	`1902`	`+ SPL_FETCH_AND_CHECK_DUAL_IT(intern, ZEND_THIS);`
	`1903`	`+`
`1902`	`1904`	`RETURN_STR_COPY(intern->u.regex.regex);`
`1903`	`1905`	`} /* }}} */`
`1904`	`1906`