del php-src: NEWS ext/standard/string.c ext/standard/tests/strings/bug71188.phpt ext/standard/tests/strings/bug71190.phpt
| From: | Anatol Belski | Date: | Tue, 22 Dec 2015 12:16:04 +0000 |
| Subject: | del php-src: NEWS ext/standard/string.c ext/standard/tests/strings/bug71188.phpt ext/standard/tests/strings/bug71190.phpt | ||
| Groups: | php.cvs | ||
| Request: | Send a blank email to php-cvs+get-90382@lists.php.net to get a copy of this message | ||
Branch: PHP-7.0.2
Deleted commits count: 3
User: Anatol Belski <ab@php.net> Tue, 22 Dec 2015 12:16:04 +0000
Changed paths:
M NEWS
M ext/standard/string.c
D ext/standard/tests/strings/bug71188.phpt
D ext/standard/tests/strings/bug71190.phpt
Diff:
diff --git b/NEWS a/NEWS
index 1e3501a..2b5912d 100644
--- b/NEWS
+++ a/NEWS
@@ -62,12 +62,6 @@ PHP NEWS
. Fixed bug #71153 (Performance Degradation in ArrayIterator with large
arrays). (Nikita)
-- Standard:
- . Fixed bug #71190 (substr_replace converts integers in original $search
- array to strings). (Laruence)
- . Fixed bug #71188 (str_replace converts integers in original $search array
- to strings). (Laruence)
-
17 Dec 2015, PHP 7.0.1
- Core:
diff --git b/ext/standard/string.c a/ext/standard/string.c
index 34ef5a6..3d5b76c 100644
--- b/ext/standard/string.c
+++ a/ext/standard/string.c
@@ -2495,7 +2495,8 @@ PHP_FUNCTION(substr_replace)
if (Z_TYPE_P(str) != IS_ARRAY) {
if (Z_TYPE_P(from) != IS_ARRAY) {
- zend_string *repl_str;
+ size_t repl_len = 0;
+
f = Z_LVAL_P(from);
/* if "from" position is negative, count start position from the end
@@ -2536,23 +2537,21 @@ PHP_FUNCTION(substr_replace)
repl_idx++;
}
if (repl_idx < Z_ARRVAL_P(repl)->nNumUsed) {
- repl_str = zval_get_string(tmp_repl);
- } else {
- repl_str = STR_EMPTY_ALLOC();
+ convert_to_string_ex(tmp_repl);
+ repl_len = Z_STRLEN_P(tmp_repl);
}
} else {
- repl_str = Z_STR_P(repl);
+ repl_len = Z_STRLEN_P(repl);
}
- result = zend_string_alloc(Z_STRLEN_P(str) - l + ZSTR_LEN(repl_str), 0);
+ result = zend_string_alloc(Z_STRLEN_P(str) - l + repl_len, 0);
memcpy(ZSTR_VAL(result), Z_STRVAL_P(str), f);
- if (ZSTR_LEN(repl_str)) {
- memcpy((ZSTR_VAL(result) + f), ZSTR_VAL(repl_str), ZSTR_LEN(repl_str));
+ if (repl_len) {
+ memcpy((ZSTR_VAL(result) + f), (Z_TYPE_P(repl) == IS_ARRAY ? Z_STRVAL_P(tmp_repl) :
Z_STRVAL_P(repl)), repl_len);
}
- memcpy((ZSTR_VAL(result) + f + ZSTR_LEN(repl_str)), Z_STRVAL_P(str) + f + l, Z_STRLEN_P(str) - f
- l);
+ memcpy((ZSTR_VAL(result) + f + repl_len), Z_STRVAL_P(str) + f + l, Z_STRLEN_P(str) - f - l);
ZSTR_VAL(result)[ZSTR_LEN(result)] = '\0';
- zend_string_release(repl_str);
RETURN_NEW_STR(result);
} else {
php_error_docref(NULL, E_WARNING, "Functionality of 'from' and 'len' as
arrays is not implemented");
@@ -3973,12 +3972,12 @@ static zend_long php_str_replace_in_subject(zval *search, zval *replace,
zval *s
/* For each entry in the search array, get the entry */
ZEND_HASH_FOREACH_VAL(Z_ARRVAL_P(search), search_entry) {
/* Make sure we're dealing with strings. */
- zend_string *search_str = zval_get_string(search_entry);
- if (ZSTR_LEN(search_str) == 0) {
+ ZVAL_DEREF(search_entry);
+ convert_to_string(search_entry);
+ if (Z_STRLEN_P(search_entry) == 0) {
if (Z_TYPE_P(replace) == IS_ARRAY) {
replace_idx++;
}
- zend_string_release(search_str);
continue;
}
@@ -4008,11 +4007,11 @@ static zend_long php_str_replace_in_subject(zval *search, zval *replace,
zval *s
}
}
- if (ZSTR_LEN(search_str) == 1) {
+ if (Z_STRLEN_P(search_entry) == 1) {
zend_long old_replace_count = replace_count;
tmp_result = php_char_to_str_ex(Z_STR_P(result),
- ZSTR_VAL(search_str)[0],
+ Z_STRVAL_P(search_entry)[0],
replace_value,
replace_len,
case_sensitivity,
@@ -4021,10 +4020,10 @@ static zend_long php_str_replace_in_subject(zval *search, zval *replace,
zval *s
zend_string_release(lc_subject_str);
lc_subject_str = NULL;
}
- } else if (ZSTR_LEN(search_str) > 1) {
+ } else if (Z_STRLEN_P(search_entry) > 1) {
if (case_sensitivity) {
tmp_result = php_str_to_str_ex(Z_STR_P(result),
- ZSTR_VAL(search_str), ZSTR_LEN(search_str),
+ Z_STRVAL_P(search_entry), Z_STRLEN_P(search_entry),
replace_value, replace_len, &replace_count);
} else {
zend_long old_replace_count = replace_count;
@@ -4033,7 +4032,7 @@ static zend_long php_str_replace_in_subject(zval *search, zval *replace, zval
*s
lc_subject_str = php_string_tolower(Z_STR_P(result));
}
tmp_result = php_str_to_str_i_ex(Z_STR_P(result), ZSTR_VAL(lc_subject_str),
- search_str, replace_value, replace_len, &replace_count);
+ Z_STR_P(search_entry), replace_value, replace_len, &replace_count);
if (replace_count != old_replace_count) {
zend_string_release(lc_subject_str);
lc_subject_str = NULL;
@@ -4041,8 +4040,6 @@ static zend_long php_str_replace_in_subject(zval *search, zval *replace, zval
*s
}
}
- zend_string_release(search_str);
-
if (replace_entry_str) {
zend_string_release(replace_entry_str);
replace_entry_str = NULL;
@@ -4062,7 +4059,6 @@ static zend_long php_str_replace_in_subject(zval *search, zval *replace, zval
*s
zend_string_release(lc_subject_str);
}
} else {
- ZEND_ASSERT(Z_TYPE_P(search) == IS_STRING);
if (Z_STRLEN_P(search) == 1) {
ZVAL_STR(result,
php_char_to_str_ex(subject_str,
diff --git b/ext/standard/tests/strings/bug71188.phpt a/ext/standard/tests/strings/bug71188.phpt
deleted file mode 100644
index 1073825..0000000
--- b/ext/standard/tests/strings/bug71188.phpt
+++ /dev/null
@@ -1,28 +0,0 @@
---TEST--
-Bug #71188 (str_replace converts integers in original $search array to strings)
---FILE--
-<?php
-$a = [0, 1, 2];
-$b = ["Nula", "Jedna", "Dva"];
-
-var_dump($a);
-str_replace($a, $b, "1");
-var_dump($a);
-?>
---EXPECT--
-array(3) {
- [0]=>
- int(0)
- [1]=>
- int(1)
- [2]=>
- int(2)
-}
-array(3) {
- [0]=>
- int(0)
- [1]=>
- int(1)
- [2]=>
- int(2)
-}
diff --git b/ext/standard/tests/strings/bug71190.phpt a/ext/standard/tests/strings/bug71190.phpt
deleted file mode 100644
index feabe7c..0000000
--- b/ext/standard/tests/strings/bug71190.phpt
+++ /dev/null
@@ -1,27 +0,0 @@
---TEST--
-Bug #71190 (substr_replace converts integers in original $search array to strings)
---FILE--
-<?php
-$b = [0, 1, 2];
-
-var_dump($b);
-substr_replace("test", $b, "1");
-var_dump($b);
-?>
---EXPECT--
-array(3) {
- [0]=>
- int(0)
- [1]=>
- int(1)
- [2]=>
- int(2)
-}
-array(3) {
- [0]=>
- int(0)
- [1]=>
- int(1)
- [2]=>
- int(2)
-}