Fix legacy conversion filter for UTF-7

alexdowad · alexdowad · commit 1662f7f79f5e · 2022-07-18T15:11:31.000+02:00
diff --git a/ext/mbstring/libmbfl/filters/mbfilter_utf7.c b/ext/mbstring/libmbfl/filters/mbfilter_utf7.c
@@ -290,7 +290,7 @@ int mbfl_filt_conv_wchar_utf7(int c, mbfl_convert_filter *filter)
 		}
 	} else if (c >= 0 && c < MBFL_WCSPLANE_UCS2MAX) {
 		;
-	} else if (c >= MBFL_WCSPLANE_SUPMIN && c < MBFL_WCSPLANE_SUPMAX) {
+	} else if (c >= MBFL_WCSPLANE_SUPMIN && c < MBFL_WCSPLANE_UTF32MAX) {
 		CK((*filter->filter_function)(((c >> 10) - 0x40) | 0xd800, filter));
 		CK((*filter->filter_function)((c & 0x3ff) | 0xdc00, filter));
 		return 0;

Original file line number	Diff line number	Diff line change
`@@ -290,7 +290,7 @@ int mbfl_filt_conv_wchar_utf7(int c, mbfl_convert_filter *filter)`
`290`	`290`	`}`
`291`	`291`	`} else if (c >= 0 && c < MBFL_WCSPLANE_UCS2MAX) {`
`292`	`292`	`;`
`293`		`- } else if (c >= MBFL_WCSPLANE_SUPMIN && c < MBFL_WCSPLANE_SUPMAX) {`
	`293`	`+ } else if (c >= MBFL_WCSPLANE_SUPMIN && c < MBFL_WCSPLANE_UTF32MAX) {`
`294`	`294`	`CK((*filter->filter_function)(((c >> 10) - 0x40) \| 0xd800, filter));`
`295`	`295`	`CK((*filter->filter_function)((c & 0x3ff) \| 0xdc00, filter));`
`296`	`296`	`return 0;`