Merge branch 'PHP-8.1'

cmb69 · cmb69 · commit 97f78b3bb714 · 2021-12-03T22:50:27.000+01:00
* PHP-8.1:
  Fix #81693: mb_check_encoding(7bit) segfaults
diff --git a/ext/mbstring/libmbfl/mbfl/mbfl_convert.c b/ext/mbstring/libmbfl/mbfl/mbfl_convert.c
@@ -307,7 +307,8 @@ const struct mbfl_convert_vtbl* mbfl_convert_filter_get_vtbl(const mbfl_encoding
 		from = &mbfl_encoding_8bit;
 	} else if (from->no_encoding == mbfl_no_encoding_base64 ||
 			   from->no_encoding == mbfl_no_encoding_qprint ||
-			   from->no_encoding == mbfl_no_encoding_uuencode) {
+			   from->no_encoding == mbfl_no_encoding_uuencode ||
+			   from->no_encoding == mbfl_no_encoding_7bit) {
 		to = &mbfl_encoding_8bit;
 	}
 
diff --git a/ext/mbstring/tests/bug81693.phpt b/ext/mbstring/tests/bug81693.phpt
@@ -0,0 +1,10 @@
+--TEST--
+Bug #81693 (mb_check_encoding(7bit) segfaults)
+--EXTENSIONS--
+mbstring
+--FILE--
+<?php
+var_dump(mb_check_encoding('Hello world', '7bit'));
+?>
+--EXPECT--
+bool(true)

Original file line number	Diff line number	Diff line change
`@@ -307,7 +307,8 @@ const struct mbfl_convert_vtbl* mbfl_convert_filter_get_vtbl(const mbfl_encoding`
`307`	`307`	`from = &mbfl_encoding_8bit;`
`308`	`308`	`} else if (from->no_encoding == mbfl_no_encoding_base64 \|\|`
`309`	`309`	`from->no_encoding == mbfl_no_encoding_qprint \|\|`
`310`		`- from->no_encoding == mbfl_no_encoding_uuencode) {`
	`310`	`+ from->no_encoding == mbfl_no_encoding_uuencode \|\|`
	`311`	`+ from->no_encoding == mbfl_no_encoding_7bit) {`
`311`	`312`	`to = &mbfl_encoding_8bit;`
`312`	`313`	`}`
`313`	`314`