diff options
| author | Christoph M. Becker <cmbecker69@gmx.de> | 2018-03-19 13:51:40 +0100 |
|---|---|---|
| committer | Christoph M. Becker <cmbecker69@gmx.de> | 2018-03-19 14:24:27 +0100 |
| commit | 47461368ca4ea2d2c23482cbd655bd96b2acbfc8 (patch) | |
| tree | 89a390ef47ffdc9a585f3dfc877499df2fe2e042 | |
| parent | f46da1da7ddc1af2395868eb6dcfc02a96c83396 (diff) | |
| download | php-git-47461368ca4ea2d2c23482cbd655bd96b2acbfc8.tar.gz | |
Fix #75944: Wrong cp1251 detection
`\xFF` is a valid character of CP-1251.
| -rw-r--r-- | NEWS | 2 | ||||
| -rw-r--r-- | ext/mbstring/libmbfl/filters/mbfilter_cp1251.c | 2 | ||||
| -rw-r--r-- | ext/mbstring/tests/bug75944.phpt | 13 |
3 files changed, 16 insertions, 1 deletions
@@ -2,6 +2,8 @@ PHP NEWS ||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||| ?? ??? ????, PHP 7.1.17 +- Mbstring: + . Fixed bug #75944 (Wrong cp1251 detection). (dmk001) 29 Mar 2018, PHP 7.1.16 diff --git a/ext/mbstring/libmbfl/filters/mbfilter_cp1251.c b/ext/mbstring/libmbfl/filters/mbfilter_cp1251.c index a26ce19492..2d47ac304a 100644 --- a/ext/mbstring/libmbfl/filters/mbfilter_cp1251.c +++ b/ext/mbstring/libmbfl/filters/mbfilter_cp1251.c @@ -142,7 +142,7 @@ mbfl_filt_conv_wchar_cp1251(int c, mbfl_convert_filter *filter) /* all of this is so ugly now! */ static int mbfl_filt_ident_cp1251(int c, mbfl_identify_filter *filter) { - if (c >= 0x80 && c < 0xff) + if (c >= 0x80 && c <= 0xff) filter->flag = 0; else filter->flag = 1; /* not it */ diff --git a/ext/mbstring/tests/bug75944.phpt b/ext/mbstring/tests/bug75944.phpt new file mode 100644 index 0000000000..81788d7196 --- /dev/null +++ b/ext/mbstring/tests/bug75944.phpt @@ -0,0 +1,13 @@ +--TEST--
+Bug #75944 (wrong detection cp1251 encoding because of missing last cyrillic letter)
+--SKIPIF--
+<?php extension_loaded('mbstring') or die('skip mbstring not available'); ?>
+--FILE--
+<?php
+var_dump(mb_detect_encoding(chr(0xfe), array('CP-1251'))); // letter '?'
+var_dump(mb_detect_encoding(chr(0xff), array('CP-1251'))); // letter '?'
+?>
+--EXPECT--
+string(12) "Windows-1251"
+string(12) "Windows-1251"
+
|