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

Merge branch 'PHP-7.4'

* PHP-7.4:
  Fixed bug #79951
---

dd858460bb7ad230449fa9643e1206b74b6355de
diff --cc ext/standard/string.c
index bfa2d57088,2c1967ad58..9a877ce138
--- a/ext/standard/string.c
+++ b/ext/standard/string.c
@@@ -4087,14 -4353,13 +4087,11 @@@ PHPAPI void php_stripslashes(zend_strin
  #define _isblank(c)   (((((unsigned char) c) == ' '  || ((unsigned char) c) == '\t')) ? 1 : 0)
  #define _isnewline(c) (((((unsigned char) c) == '\n' || ((unsigned char) c) == '\r')) ? 1 : 0)
  
 -/* {{{ php_str_replace_in_subject
 - */
 -static zend_long php_str_replace_in_subject(zval *search, zval *replace, zval *subject, zval *result, int case_sensitivity)
 +/* {{{ php_str_replace_in_subject */
 +static zend_long php_str_replace_in_subject(zval *search, zval *replace, zend_string *subject_str, zval *result, int case_sensitivity)
  {
- 	zval		*search_entry,
- 				*replace_entry = NULL;
- 	zend_string	*tmp_result,
- 	            *tmp_replace_entry_str = NULL,
- 				*replace_entry_str;
+ 	zval		*search_entry;
 -	zend_string	*tmp_result,
 -	            *tmp_subject_str;
++	zend_string	*tmp_result;
  	char		*replace_value = NULL;
  	size_t		 replace_len = 0;
  	zend_long	 replace_count = 0;