diff --git a/Zend/tests/multibyte/multibyte_encoding_007.phpt b/Zend/tests/multibyte/multibyte_encoding_007.phpt new file mode 100644 index 00000000000..5e3323403d6 --- /dev/null +++ b/Zend/tests/multibyte/multibyte_encoding_007.phpt @@ -0,0 +1,15 @@ +--TEST-- +Don't segfault when zend.script_encoding=pass +--EXTENSIONS-- +mbstring +--INI-- +zend.multibyte=1 +zend.script_encoding=pass +internal_encoding=UTF-8 +--FILE-- + +--EXPECT-- +Warning: PHP Startup: INI setting contains invalid encoding "pass" in Unknown on line 0 +Done! diff --git a/ext/mbstring/mbstring.c b/ext/mbstring/mbstring.c index ad15dd6768e..9cbf539431e 100644 --- a/ext/mbstring/mbstring.c +++ b/ext/mbstring/mbstring.c @@ -474,7 +474,7 @@ static zend_result php_mb_zend_encoding_list_parser(const char *encoding_list, s return php_mb_parse_encoding_list( encoding_list, encoding_list_len, (const mbfl_encoding ***)return_list, return_size, - persistent, /* arg_num */ 0, /* allow_pass_encoding */ 1); + persistent, /* arg_num */ 0, /* allow_pass_encoding */ 0); } static const zend_encoding *php_mb_zend_internal_encoding_getter(void)