Patch mbstring_cp1251_0xff_return for mbstring related Bug #75944

Patch version 2018-02-16 20:42 UTC

• 2018-02-16 20:42 UTC [diff to current]
• 2018-02-09 18:48 UTC [diff to current]

Developer: dmk001@inbox.ru

diff --git a/ext/mbstring/libmbfl/filters/mbfilter_cp1251.c b/ext/mbstring/libmbfl/filters/mbfilter_cp1251.c
index 532806f..e28da31 100644
--- a/ext/mbstring/libmbfl/filters/mbfilter_cp1251.c
+++ b/ext/mbstring/libmbfl/filters/mbfilter_cp1251.c
@@ -144,7 +144,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 0000000..20cb9f5
--- /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"
+