Skip to content

Commit 69543e6

Browse files
nielsdosalexdowad
authored andcommitted
Make error checks on encoding methods for docomo, kddi, sb consistent
Some places use an if check, which implicitly checks for a non-zero value, and some places use > 0. The > 0 is the correct one because at least some of those functions already use the CK() macro to return -1 on error. Because -1 != 0 this is wrongly interpreted as a success instead of a failure.
1 parent df93146 commit 69543e6

File tree

2 files changed

+4
-4
lines changed

2 files changed

+4
-4
lines changed

ext/mbstring/libmbfl/filters/mbfilter_iso2022jp_mobile.c

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -288,7 +288,7 @@ int mbfl_filt_conv_wchar_2022jp_mobile(int c, mbfl_convert_filter *filter)
288288
}
289289
}
290290

291-
if (mbfilter_unicode2sjis_emoji_kddi(c, &s1, filter)) {
291+
if (mbfilter_unicode2sjis_emoji_kddi(c, &s1, filter) > 0) {
292292
CODE2JIS(c1,c2,s1,s2);
293293
s1 -= 0x1600;
294294
}

ext/mbstring/libmbfl/filters/mbfilter_sjis_mobile.c

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -819,9 +819,9 @@ int mbfl_filt_conv_wchar_sjis_mobile(int c, mbfl_convert_filter *filter)
819819
}
820820
}
821821

822-
if ((filter->to == &mbfl_encoding_sjis_docomo && mbfilter_unicode2sjis_emoji_docomo(c, &s1, filter)) ||
823-
(filter->to == &mbfl_encoding_sjis_kddi && mbfilter_unicode2sjis_emoji_kddi(c, &s1, filter)) ||
824-
(filter->to == &mbfl_encoding_sjis_sb && mbfilter_unicode2sjis_emoji_sb(c, &s1, filter))) {
822+
if ((filter->to == &mbfl_encoding_sjis_docomo && mbfilter_unicode2sjis_emoji_docomo(c, &s1, filter) > 0) ||
823+
(filter->to == &mbfl_encoding_sjis_kddi && mbfilter_unicode2sjis_emoji_kddi(c, &s1, filter) > 0) ||
824+
(filter->to == &mbfl_encoding_sjis_sb && mbfilter_unicode2sjis_emoji_sb(c, &s1, filter) > 0)) {
825825
CODE2JIS(c1,c2,s1,s2);
826826
}
827827

0 commit comments

Comments
 (0)