Skip to content

Commit 0ec34da

Browse files
committed
CP5022{0,1,2}: treat unrecognized escapes as error
1 parent a50607d commit 0ec34da

File tree

1 file changed

+4
-4
lines changed

1 file changed

+4
-4
lines changed

ext/mbstring/libmbfl/filters/mbfilter_cp5022x.c

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -296,7 +296,7 @@ mbfl_filt_conv_jis_ms_wchar(int c, mbfl_convert_filter *filter)
296296
filter->status += 3;
297297
} else {
298298
filter->status &= ~0xf;
299-
CK((*filter->output_function)(0x1b, filter->data));
299+
CK((*filter->output_function)(0x1b | MBFL_WCSGROUP_THROUGH, filter->data));
300300
goto retry;
301301
}
302302
break;
@@ -314,7 +314,7 @@ mbfl_filt_conv_jis_ms_wchar(int c, mbfl_convert_filter *filter)
314314
filter->status++;
315315
} else {
316316
filter->status &= ~0xf;
317-
CK((*filter->output_function)(0x1b, filter->data));
317+
CK((*filter->output_function)(0x1b | MBFL_WCSGROUP_THROUGH, filter->data));
318318
CK((*filter->output_function)(0x24, filter->data));
319319
goto retry;
320320
}
@@ -333,7 +333,7 @@ mbfl_filt_conv_jis_ms_wchar(int c, mbfl_convert_filter *filter)
333333
filter->status = 0x90;
334334
} else {
335335
filter->status &= ~0xf;
336-
CK((*filter->output_function)(0x1b, filter->data));
336+
CK((*filter->output_function)(0x1b | MBFL_WCSGROUP_THROUGH, filter->data));
337337
CK((*filter->output_function)(0x24, filter->data));
338338
CK((*filter->output_function)(0x28, filter->data));
339339
goto retry;
@@ -355,7 +355,7 @@ mbfl_filt_conv_jis_ms_wchar(int c, mbfl_convert_filter *filter)
355355
filter->status = 0x20;
356356
} else {
357357
filter->status &= ~0xf;
358-
CK((*filter->output_function)(0x1b, filter->data));
358+
CK((*filter->output_function)(0x1b | MBFL_WCSGROUP_THROUGH, filter->data));
359359
CK((*filter->output_function)(0x28, filter->data));
360360
goto retry;
361361
}

0 commit comments

Comments
 (0)