Merge branch 'PHP-8.1' into PHP-8.2

* PHP-8.1: Fix mb_strlen is wrong length for CP932 when 0x80.
php · May 30, 2023 · c33589e · c33589e
2 parents 0e7ad40 + c50172e
commit c33589e
Show file tree

Hide file tree

Showing 2 changed files with 10 additions and 2 deletions.
diff --git a/ext/mbstring/libmbfl/filters/mbfilter_cp932.c b/ext/mbstring/libmbfl/filters/mbfilter_cp932.c
@@ -68,7 +68,7 @@ static size_t mb_cp932_to_wchar(unsigned char **in, size_t *in_len, uint32_t *bu
 static void mb_wchar_to_cp932(uint32_t *in, size_t len, mb_convert_buf *buf, bool end);
 static void mb_wchar_to_sjiswin(uint32_t *in, size_t len, mb_convert_buf *buf, bool end);
 
-static const unsigned char mblen_table_sjis[] = { /* 0x80-0x9f,0xE0-0xFF */
+static const unsigned char mblen_table_sjis[] = { /* 0x81-0x9f,0xE0-0xFF */
   1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1,
   1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1,
   1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1,
@@ -77,7 +77,7 @@ static const unsigned char mblen_table_sjis[] = { /* 0x80-0x9f,0xE0-0xFF */
   1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1,
   1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1,
   1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1,
-  2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2,
+  1, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2,
   2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2,
   1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1,
   1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1,

diff --git a/ext/mbstring/tests/mb_strlen.phpt b/ext/mbstring/tests/mb_strlen.phpt
@@ -35,6 +35,11 @@ print "-- Testing illegal bytes 0x80,0xFD-FF --\n";
 print mb_strlen("\x80\xA1", 'SJIS') . "\n";
 print mb_strlen("abc\xFD\xFE\xFF", 'SJIS') . "\n";
 
+echo "== CP932 ==\n";
+print mb_strlen("\x80\xA1", "CP932") . "\n";
+// 0xFD, 0xFE, 0xFF is reserved.
+print mb_strlen("abc\xFD\xFE\xFF", 'CP932') . "\n";
+
 echo "== MacJapanese ==\n";
 print mb_strlen("\x80\xA1", 'MacJapanese') . "\n";
 print mb_strlen("abc\xFD\xFE\xFF", 'MacJapanese') . "\n";
@@ -91,6 +96,9 @@ try {
 -- Testing illegal bytes 0x80,0xFD-FF --
 2
 6
+== CP932 ==
+2
+5
 == MacJapanese ==
 2
 6