1 files changed, 5 insertions, 3 deletions
diff --git a/regenc.c b/regenc.c
index 288eac433d..fc039154b4 100644
--- a/regenc.c
+++ b/regenc.c
@@ -55,10 +55,12 @@ extern int
 onigenc_mbclen_approximate(const OnigUChar* p,const OnigUChar* e, struct OnigEncodingTypeST* enc)
 {
   int ret = ONIGENC_PRECISE_MBC_ENC_LEN(enc,p,e);
-  if (ONIGENC_MBCLEN_CHARFOUND_P(ret))
-    return ONIGENC_MBCLEN_CHARFOUND_LEN(ret);
-  else if (ONIGENC_MBCLEN_NEEDMORE_P(ret))
+  if (ONIGENC_MBCLEN_NEEDMORE_P(ret))
     return (int)(e-p)+ONIGENC_MBCLEN_NEEDMORE_LEN(ret);
+  else if (ONIGENC_MBCLEN_INVALID_P(ret))
+    return (int)(e-p)+ONIGENC_MBCLEN_INVALID_LEN(ret);
+  else if (ONIGENC_MBCLEN_CHARFOUND_P(ret))
+    return ONIGENC_MBCLEN_CHARFOUND_LEN(ret);
   return 1;
 }