Skip to content

Commit e447036

Browse files
committed
Merge branch 'PHP-8.2'
* PHP-8.2: Propagate error checks for mbfl_filt_conv_illegal_output() Use CK() macro to check the output function in mbfilter_unicode2sjis_emoji_sb() Make error checks on encoding methods for docomo, kddi, sb consistent
2 parents 8666977 + 3142829 commit e447036

File tree

2 files changed

+2
-2
lines changed

2 files changed

+2
-2
lines changed

ext/mbstring/libmbfl/filters/mbfilter_7bit.c

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

ext/mbstring/libmbfl/filters/mbfilter_iso2022jp_mobile.c

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -414,7 +414,7 @@ static int mbfl_filt_conv_wchar_2022jp_mobile(int c, mbfl_convert_filter *filter
414414
}
415415
}
416416

417-
if (mbfilter_unicode2sjis_emoji_kddi(c, &s1, filter)) {
417+
if (mbfilter_unicode2sjis_emoji_kddi(c, &s1, filter) > 0) {
418418
/* A KDDI emoji was detected and stored in s1 */
419419
CODE2JIS(c1,c2,s1,s2);
420420
s1 -= 0x1600;

0 commit comments

Comments
 (0)