1 files changed, 3 insertions, 2 deletions
diff --git a/euc_jp.c b/euc_jp.c
index 65729feda8..f39c4de628 100644
--- a/euc_jp.c
+++ b/euc_jp.c
@@ -78,8 +78,9 @@ static int
 code_to_mbclen(OnigCodePoint code)
 {
   if (ONIGENC_IS_CODE_ASCII(code)) return 1;
-  else if ((code & 0xff0000) != 0) return 3;
-  else if ((code &   0xff00) != 0) return 2;
+  else if (code > 0xffffff) return 0;
+  else if ((code & 0xff0000) >= 0x800000) return 3;
+  else if ((code &   0xff00) >= 0x8000) return 2;
   else return 0;
 }