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

Merge branch 'PHP-8.3'

Browse Source 
* PHP-8.3:
  Do not allow zend.script_encoding to be set to 'pass'
This commit is contained in:
Alex Dowad
2024-01-21 15:14:29 +02:00
parent ec0044129a 1e92d47f41
commit 6fa4286ba4
2 changed files with 16 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

15
Zend/tests/multibyte/multibyte_encoding_007.phpt Normal file
View File

@@ -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--
<?php
print "Done!\n";
?>
--EXPECT--
Warning: PHP Startup: INI setting contains invalid encoding "pass" in Unknown on line 0
Done!

2
ext/mbstring/mbstring.c
View File

@@ -478,7 +478,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)