com php-src: Fix Bug #72992 mbstring.internal_encoding do esn't inherit default_charset: ext/mbstring/mbstrin g.c

From: Date: Thu, 08 Sep 2016 04:17:10 +0000
Subject: com php-src: Fix Bug #72992 mbstring.internal_encoding do esn't inherit default_charset: ext/mbstring/mbstrin g.c
Groups: php.cvs 
Request: Send a blank email to php-cvs+get-94361@lists.php.net to get a copy of this message
Commit: 8bbd0952e5bba88426bac1596dcc3bfa504dbe4e Author: Yasuo Ohgaki <yohgaki@php.net> Thu, 8 Sep 2016 13:16:50 +0900 Parents: dad793630d5966a9c22f3fcd7f24b7937bd1a36f Branches: PHP-5.6 PHP-7.0 PHP-7.1 master Link: http://git.php.net/?p=php-src.git;a=commitdiff;h=8bbd0952e5bba88426bac1596dcc3bfa504dbe4e Log: Fix Bug #72992 mbstring.internal_encoding doesn't inherit default_charset Bugs: https://bugs.php.net/72992 Changed paths: M ext/mbstring/mbstring.c Diff: diff --git a/ext/mbstring/mbstring.c b/ext/mbstring/mbstring.c index 18e348d..024da7d 100644 --- a/ext/mbstring/mbstring.c +++ b/ext/mbstring/mbstring.c @@ -1260,7 +1260,7 @@ static PHP_INI_MH(OnUpdate_mbstring_http_input) const mbfl_encoding **list; size_t size; - if (!new_value) { + if (!new_value || !new_value_length) { if (MBSTRG(http_input_list)) { pefree(MBSTRG(http_input_list), 1); } @@ -1328,7 +1328,7 @@ int _php_mb_ini_mbstring_internal_encoding_set(const char *new_value, uint new_v { const mbfl_encoding *encoding; - if (!new_value || new_value_length == 0 || !(encoding = mbfl_name2encoding(new_value))) { + if (!new_value || !new_value_length || !(encoding = mbfl_name2encoding(new_value))) { /* falls back to UTF-8 if an unknown encoding name is given */ encoding = mbfl_no2encoding(mbfl_no_encoding_utf8); } @@ -1361,7 +1361,7 @@ static PHP_INI_MH(OnUpdate_mbstring_internal_encoding) } if (stage & (PHP_INI_STAGE_STARTUP | PHP_INI_STAGE_SHUTDOWN | PHP_INI_STAGE_RUNTIME)) { - if (new_value_length) { + if (new_value && new_value_length) { return _php_mb_ini_mbstring_internal_encoding_set(new_value, new_value_length TSRMLS_CC); } else { return _php_mb_ini_mbstring_internal_encoding_set(get_internal_encoding(TSRMLS_C), strlen(get_internal_encoding(TSRMLS_C))+1 TSRMLS_CC);

« previous php.cvs (#94361) next »