php/archived-php-src
1
0
Fork 0
mirror of https://github.com/php/php-src.git synced 2026-03-24 00:02:20 +01:00
Code Issues Packages Projects Releases Wiki Activity

ext/mbstring: Pass string length to _php_mb_ini_mbstring_http_output_set()

Browse Source
This commit is contained in:
Gina Peter Banyard
2023-11-18 03:17:14 +00:00
parent a70786304b
commit b61479bb28
1 changed files with 5 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
ext/mbstring/mbstring.c
View File

@@ -760,7 +760,7 @@ static PHP_INI_MH(OnUpdate_mbstring_http_input)
}
/* }}} */
static zend_result _php_mb_ini_mbstring_http_output_set(const char *new_value) {
static zend_result _php_mb_ini_mbstring_http_output_set(const char *new_value, size_t length) {
const mbfl_encoding *encoding = php_mb_get_encoding_or_pass(new_value);
if (!encoding) {
return FAILURE;
@@ -779,13 +779,14 @@ static PHP_INI_MH(OnUpdate_mbstring_http_output)
}
if (new_value == NULL || ZSTR_LEN(new_value) == 0) {
const char *encoding = php_get_output_encoding();
MBSTRG(http_output_set) = 0;
_php_mb_ini_mbstring_http_output_set(php_get_output_encoding());
_php_mb_ini_mbstring_http_output_set(encoding, strlen(encoding));
return SUCCESS;
}
MBSTRG(http_output_set) = 1;
return _php_mb_ini_mbstring_http_output_set(ZSTR_VAL(new_value));
return _php_mb_ini_mbstring_http_output_set(ZSTR_VAL(new_value), ZSTR_LEN(new_value));
}
/* }}} */
@@ -966,7 +967,7 @@ static void mbstring_internal_encoding_changed_hook(void) {
if (!MBSTRG(http_output_set)) {
const char *encoding = php_get_output_encoding();
_php_mb_ini_mbstring_http_output_set(encoding);
_php_mb_ini_mbstring_http_output_set(encoding, strlen(encoding));
}
if (!MBSTRG(http_input_set)) {