For JIS/ISO-2022-JP, treat a truncated escape sequence as error

alexdowad · alexdowad · commit 8466e07fdc3b · 2022-05-08T14:59:57.000+02:00
diff --git a/ext/mbstring/libmbfl/filters/mbfilter_jis.c b/ext/mbstring/libmbfl/filters/mbfilter_jis.c
@@ -266,8 +266,9 @@ mbfl_filt_conv_jis_wchar(int c, mbfl_convert_filter *filter)
 
 static int mbfl_filt_conv_jis_wchar_flush(mbfl_convert_filter *filter)
 {
-	if ((filter->status & 0xF) == 1) {
-		/* 2-byte (JIS X 0208 or 0212) character was truncated */
+	if (filter->status & 0xF) {
+		/* 2-byte (JIS X 0208 or 0212) character was truncated,
+		 * or else escape sequence was truncated */
 		CK((*filter->output_function)(MBFL_BAD_INPUT, filter->data));
 	}
 	return 0;

Original file line number	Diff line number	Diff line change
`@@ -266,8 +266,9 @@ mbfl_filt_conv_jis_wchar(int c, mbfl_convert_filter *filter)`
`266`	`266`
`267`	`267`	`static int mbfl_filt_conv_jis_wchar_flush(mbfl_convert_filter *filter)`
`268`	`268`	`{`
`269`		`- if ((filter->status & 0xF) == 1) {`
`270`		`- /* 2-byte (JIS X 0208 or 0212) character was truncated */`
	`269`	`+ if (filter->status & 0xF) {`
	`270`	`+ /* 2-byte (JIS X 0208 or 0212) character was truncated,`
	`271`	`+ * or else escape sequence was truncated */`
`271`	`272`	`CK((*filter->output_function)(MBFL_BAD_INPUT, filter->data));`
`272`	`273`	`}`
`273`	`274`	`return 0;`