Skip to content

Commit d66ca5d

Browse files
nielsdosalexdowad
authored andcommitted
Propagate error checks for mbfl_filt_conv_illegal_output()
1 parent 263655a commit d66ca5d

File tree

2 files changed

+4
-4
lines changed

2 files changed

+4
-4
lines changed

ext/mbstring/libmbfl/filters/mbfilter_7bit.c

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -76,7 +76,7 @@ int mbfl_filt_conv_any_7bit(int c, mbfl_convert_filter *filter)
7676
if (c >= 0 && c < 0x80) {
7777
CK((*filter->output_function)(c, filter->data));
7878
} else {
79-
mbfl_filt_conv_illegal_output(c, filter);
79+
CK(mbfl_filt_conv_illegal_output(c, filter));
8080
}
8181
return 0;
8282
}

ext/mbstring/libmbfl/filters/mbfilter_sjis_mobile.c

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -462,7 +462,7 @@ int mbfilter_unicode2sjis_emoji_kddi(int c, int *s1, mbfl_convert_filter *filter
462462

463463
/* If none of the KDDI national flag emoji matched, then we have no way
464464
* to convert the previous codepoint... */
465-
mbfl_filt_conv_illegal_output(c1, filter);
465+
CK(mbfl_filt_conv_illegal_output(c1, filter));
466466
}
467467

468468
if (c == '#' || (c >= '0' && c <= '9')) {
@@ -534,7 +534,7 @@ int mbfilter_unicode2sjis_emoji_sb(int c, int *s1, mbfl_convert_filter *filter)
534534

535535
/* If none of the SoftBank national flag emoji matched, then we have no way
536536
* to convert the previous codepoint... */
537-
mbfl_filt_conv_illegal_output(c1, filter);
537+
CK(mbfl_filt_conv_illegal_output(c1, filter));
538538
}
539539

540540
if (c == '#' || (c >= '0' && c <= '9')) {
@@ -855,7 +855,7 @@ int mbfl_filt_conv_sjis_mobile_flush(mbfl_convert_filter *filter)
855855
} else if (filter->status == 2) {
856856
/* First of a pair of Regional Indicator codepoints came at the end of a string */
857857
filter->cache = filter->status = 0;
858-
mbfl_filt_conv_illegal_output(c1, filter);
858+
CK(mbfl_filt_conv_illegal_output(c1, filter));
859859
}
860860

861861
if (filter->flush_function) {

0 commit comments

Comments
 (0)