clones/php-src
1
0
Fork 0
mirror of https://github.com/php/php-src.git synced 2024-09-21 18:07:23 +00:00
Code Issues Packages Projects Releases Wiki Activity

Fixed bug #71190 (substr_replace converts integers in original $search array to strings)

Browse Source
This commit is contained in:
Xinchen Hui 2015-12-22 12:07:44 +08:00
parent 3524849f77
commit d63ae2c382
3 changed files with 41 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
NEWS
View File

@ -63,8 +63,10 @@ PHP NEWS
arrays). (Nikita)
- Standard:
. Fixed #71188 (str_replace converts integers in original $search array to
strings). (Laruence)
. 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

19
ext/standard/string.c
View File

@ -2495,8 +2495,7 @@ PHP_FUNCTION(substr_replace)
if (Z_TYPE_P(str) != IS_ARRAY) {
if (Z_TYPE_P(from) != IS_ARRAY) {
size_t repl_len = 0;
zend_string *repl_str;
f = Z_LVAL_P(from);
/* if "from" position is negative, count start position from the end
@ -2537,21 +2536,23 @@ PHP_FUNCTION(substr_replace)
repl_idx++;
}
if (repl_idx < Z_ARRVAL_P(repl)->nNumUsed) {
convert_to_string_ex(tmp_repl);
repl_len = Z_STRLEN_P(tmp_repl);
repl_str = zval_get_string(tmp_repl);
} else {
repl_str = STR_EMPTY_ALLOC();
}
} else {
repl_len = Z_STRLEN_P(repl);
repl_str = Z_STR_P(repl);
}
result = zend_string_alloc(Z_STRLEN_P(str) - l + repl_len, 0);
result = zend_string_alloc(Z_STRLEN_P(str) - l + ZSTR_LEN(repl_str), 0);
memcpy(ZSTR_VAL(result), Z_STRVAL_P(str), f);
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);
if (ZSTR_LEN(repl_str)) {
memcpy((ZSTR_VAL(result) + f), ZSTR_VAL(repl_str), ZSTR_LEN(repl_str));
}
memcpy((ZSTR_VAL(result) + f + repl_len), Z_STRVAL_P(str) + f + l, Z_STRLEN_P(str) - f - l);
memcpy((ZSTR_VAL(result) + f + ZSTR_LEN(repl_str)), 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");

27
ext/standard/tests/strings/bug71190.phpt Normal file
View File

@ -0,0 +1,27 @@
--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)
}