archive/php-src
1
0
Fork 0
mirror of https://github.com/php/php-src.git synced 2025-08-16 22:18:50 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions 3

Merge branch 'PHP-7.2' into PHP-7.3

Browse source
This commit is contained in:
Nikita Popov 2019-01-14 10:23:44 +01:00
commit d6212835f2
3 changed files with 23 additions and 6 deletions
Download patch file Download diff file Expand all files Collapse all files

2
NEWS
View file

@ -27,6 +27,8 @@ PHP NEWS
- Mbstring: - Mbstring:
. Fixed bug #77428 (mb_ereg_replace() doesn't replace a substitution . Fixed bug #77428 (mb_ereg_replace() doesn't replace a substitution
variable). (Nikita) variable). (Nikita)
. Fixed bug #77454 (mb_scrub() silently truncates after a null byte).
(64796c6e69 at gmail dot com)
- MySQLnd: - MySQLnd:
. Fixed bug #75684 (In mysqlnd_ext_plugin.h the plugin methods family has . Fixed bug #75684 (In mysqlnd_ext_plugin.h the plugin methods family has

11
ext/mbstring/mbstring.c
View file

@ -5010,11 +5010,9 @@ PHP_FUNCTION(mb_chr)
/* }}} */ /* }}} */
static inline char* php_mb_scrub(const char* str, size_t str_len, const mbfl_encoding *enc) static inline char* php_mb_scrub(const char* str, size_t str_len, const mbfl_encoding *enc, size_t *ret_len)
{ {
size_t ret_len; return php_mb_convert_encoding_ex(str, str_len, enc, enc, ret_len);
return php_mb_convert_encoding_ex(str, str_len, enc, enc, &ret_len);
} }
@ -5027,6 +5025,7 @@ PHP_FUNCTION(mb_scrub)
char *enc_name = NULL; char *enc_name = NULL;
size_t enc_name_len; size_t enc_name_len;
char *ret; char *ret;
size_t ret_len;
ZEND_PARSE_PARAMETERS_START(1, 2) ZEND_PARSE_PARAMETERS_START(1, 2)
Z_PARAM_STRING(str, str_len) Z_PARAM_STRING(str, str_len)
@ -5039,13 +5038,13 @@ PHP_FUNCTION(mb_scrub)
RETURN_FALSE; RETURN_FALSE;
} }
ret = php_mb_scrub(str, str_len, enc); ret = php_mb_scrub(str, str_len, enc, &ret_len);
if (ret == NULL) { if (ret == NULL) {
RETURN_FALSE; RETURN_FALSE;
} }
RETVAL_STRING(ret); RETVAL_STRINGL(ret, ret_len);
efree(ret); efree(ret);
} }
/* }}} */ /* }}} */

16
ext/mbstring/tests/bug77454.phpt Normal file
View file

@ -0,0 +1,16 @@
--TEST--
Bug #77454: mb_scrub() silently truncates after a null byte
--FILE--
<?php
$str = "before\0after";
function test($str, $enc) {
echo str_replace("\0", '\0', mb_scrub($str, $enc)), "\n";
}
test($str, 'latin1');
test($str, 'utf-8');
test($str, 'ascii');
?>
--EXPECT--
before\0after
before\0after
before\0after