diff options
Diffstat (limited to 'enc')
| -rw-r--r-- | enc/euc_jp.c | 7 | ||||
| -rw-r--r-- | enc/shift_jis.c | 4 |
2 files changed, 6 insertions, 5 deletions
diff --git a/enc/euc_jp.c b/enc/euc_jp.c index 2666e60ae0..7667c5800e 100644 --- a/enc/euc_jp.c +++ b/enc/euc_jp.c @@ -154,9 +154,10 @@ static int code_to_mbclen(OnigCodePoint code, OnigEncoding enc ARG_UNUSED) { if (ONIGENC_IS_CODE_ASCII(code)) return 1; - else if (code > 0xffffff) return 0; - else if ((code & 0xff0000) >= 0x800000) return 3; - else if ((code & 0xff00) >= 0x8000) return 2; + else if (code > 0xffffff) + return ONIGERR_TOO_BIG_WIDE_CHAR_VALUE; + else if (code & 0x800000) return 3; + else if (code & 0x8000) return 2; else return ONIGERR_INVALID_CODE_POINT_VALUE; } diff --git a/enc/shift_jis.c b/enc/shift_jis.c index d1357b3212..9dcacb584d 100644 --- a/enc/shift_jis.c +++ b/enc/shift_jis.c @@ -135,13 +135,13 @@ code_to_mbclen(OnigCodePoint code, OnigEncoding enc ARG_UNUSED) if (EncLen_SJIS[(int )code] == 1) return 1; else - return 0; + return ONIGERR_INVALID_CODE_POINT_VALUE; } else if (code <= 0xffff) { return 2; } else - return ONIGERR_INVALID_CODE_POINT_VALUE; + return ONIGERR_TOO_BIG_WIDE_CHAR_VALUE; } static OnigCodePoint |