Treat non-ASCII characters as erroneous when converting ASCII text

alexdowad · alexdowad · commit a416f938f3c9 · 2020-11-09T13:45:17.000+02:00
diff --git a/ext/mbstring/libmbfl/filters/mbfilter_ascii.c b/ext/mbstring/libmbfl/filters/mbfilter_ascii.c
@@ -79,7 +79,12 @@ const struct mbfl_convert_vtbl vtbl_wchar_ascii = {
  */
 int mbfl_filt_conv_ascii_wchar(int c, mbfl_convert_filter *filter)
 {
-	return (*filter->output_function)(c, filter->data);
+	if (c < 0x80) {
+		(*filter->output_function)(c, filter->data);
+	} else {
+		(*filter->output_function)(c | MBFL_WCSGROUP_THROUGH, filter->data);
+	}
+	return c;
 }
 
 

Original file line number	Diff line number	Diff line change
`@@ -79,7 +79,12 @@ const struct mbfl_convert_vtbl vtbl_wchar_ascii = {`
`79`	`79`	`*/`
`80`	`80`	`int mbfl_filt_conv_ascii_wchar(int c, mbfl_convert_filter *filter)`
`81`	`81`	`{`
`82`		`- return (*filter->output_function)(c, filter->data);`
	`82`	`+ if (c < 0x80) {`
	`83`	`+ (*filter->output_function)(c, filter->data);`
	`84`	`+ } else {`
	`85`	`+ (*filter->output_function)(c \| MBFL_WCSGROUP_THROUGH, filter->data);`
	`86`	`+ }`
	`87`	`+ return c;`
`83`	`88`	`}`
`84`	`89`
`85`	`90`