From cde5b2a9cf6934bd5fe006be31d6a09901609c13 Mon Sep 17 00:00:00 2001
From: akr <akr@b2dd03c8-39d4-4d8f-98ff-823fe69b080e>
Date: Sat, 8 Dec 2007 18:41:47 +0000
Subject: * encoding.c (rb_enc_mbclen): return 1 if underlying implementation  
 returns a length longer than e-p.

git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@14141 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
---
 encoding.c | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

(limited to 'encoding.c')

diff --git a/encoding.c b/encoding.c
index 540aa88701..e902f6db0e 100644
--- a/encoding.c
+++ b/encoding.c
@@ -486,7 +486,8 @@ int
 rb_enc_mbclen(const char *p, const char *e, rb_encoding *enc)
 {
     int n = ONIGENC_PRECISE_MBC_ENC_LEN(enc, (UChar*)p, (UChar*)e);
-    if (MBCLEN_CHARFOUND(n))
+    n = MBCLEN_CHARFOUND(n);
+    if (0 < n && n <= e-p)
         return n;
     else
         return 1;
-- 
cgit v1.2.3