1 files changed, 3 insertions, 2 deletions
diff --git a/enc/euc_jp.c b/enc/euc_jp.c
index d0852c3daa..3088dfd64b 100644
--- a/enc/euc_jp.c
+++ b/enc/euc_jp.c
@@ -378,11 +378,12 @@ mbc_case_fold(OnigCaseFoldType flag,
     return 1;
   }
   else {
-    OnigCodePoint code;
     int len;
 
+    len = mbc_enc_len(p, end, enc);
+    if (len <= 0) return 1;
     code = get_lower_case(mbc_to_code(p, end, enc));
-    len = code_to_mbc(code, lower, enc);
+    /* assuming case folding in euc-jp doesn't change length */
     (*pp) += len;
     return len; /* return byte length of converted char to lower */
   }