]> granicus.if.org Git - php/commitdiff
Merge branch 'PHP-7.4'
authorNikita Popov <nikita.ppv@gmail.com>
Tue, 11 Aug 2020 08:35:59 +0000 (10:35 +0200)
committerNikita Popov <nikita.ppv@gmail.com>
Tue, 11 Aug 2020 08:35:59 +0000 (10:35 +0200)
* PHP-7.4:
  Fixed bug #79951

1  2 
ext/standard/string.c

index bfa2d57088afef98c1aeddfa281393a306acf4a7,2c1967ad5836b584cc9c8165d0b24ca6430801c3..9a877ce13871a4e77c8be13723b63b131e61aa9a
@@@ -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;