ext/pcre: Refactor php_pcre_replace_func()

We don't need the FCI anymore

Be more rigourous about the entries we receive

Author: Girgias

ext/pcre/php_pcre.c

@@ -2026,10 +2026,9 @@ static zend_string *php_pcre_replace_func_impl(pcre_cache_entry *pce, zend_strin
 	return result;
 }
 
-/* {{{ php_pcre_replace_func */
 static zend_always_inline zend_string *php_pcre_replace_func(zend_string *regex,
 							  zend_string *subject_str,
-							  zend_fcall_info *fci, zend_fcall_info_cache *fcc,
+							  zend_fcall_info_cache *fcc,
 							  size_t limit, size_t *replace_count, zend_long flags)
 {
 	pcre_cache_entry	*pce;			    /* Compiled regular expression */
@@ -2045,7 +2044,6 @@ static zend_always_inline zend_string *php_pcre_replace_func(zend_string *regex,
 
 	return result;
 }
-/* }}} */
 
 /* {{{ php_pcre_replace_array */
 static zend_string *php_pcre_replace_array(HashTable *regex,
@@ -2144,16 +2142,14 @@ static zend_always_inline zend_string *php_replace_in_subject(
 }
 /* }}} */
 
-/* {{{ php_replace_in_subject_func */
 static zend_string *php_replace_in_subject_func(zend_string *regex_str, HashTable *regex_ht,
 	zend_fcall_info *fci, zend_fcall_info_cache *fcc,
 	zend_string *subject, size_t limit, size_t *replace_count, zend_long flags)
 {
 	zend_string *result;
 
 	if (regex_str) {
-		result = php_pcre_replace_func(
-			regex_str, subject, fci, fcc, limit, replace_count, flags);
+		result = php_pcre_replace_func(regex_str, subject, fcc, limit, replace_count, flags);
 		return result;
 	} else {
 		/* If regex is an array */
@@ -2166,14 +2162,16 @@ static zend_string *php_replace_in_subject_func(zend_string *regex_str, HashTabl
 		/* For each entry in the regex array, get the entry */
 		ZEND_HASH_FOREACH_VAL(regex_ht, regex_entry) {
 			/* Make sure we're dealing with strings. */
-			zend_string *tmp_regex_entry_str;
-			zend_string *regex_entry_str = zval_get_tmp_string(regex_entry, &tmp_regex_entry_str);
+			zend_string *regex_entry_str = zval_try_get_string(regex_entry);
+			if (UNEXPECTED(regex_entry_str == NULL)) {
+				break;
+			}
 
 			/* Do the actual replacement and put the result back into subject
 			   for further replacements. */
 			result = php_pcre_replace_func(
-				regex_entry_str, subject, fci, fcc, limit, replace_count, flags);
-			zend_tmp_string_release(tmp_regex_entry_str);
+				regex_entry_str, subject, fcc, limit, replace_count, flags);
+			zend_string_release_ex(regex_entry_str, false);
 			zend_string_release(subject);
 			subject = result;
 			if (UNEXPECTED(result == NULL)) {
@@ -2184,7 +2182,6 @@ static zend_string *php_replace_in_subject_func(zend_string *regex_str, HashTabl
 		return subject;
 	}
 }
-/* }}} */
 
 /* {{{ preg_replace_func_impl */
 static size_t preg_replace_func_impl(zval *return_value,