diff options
| author | akr <akr@b2dd03c8-39d4-4d8f-98ff-823fe69b080e> | 2007-12-08 19:10:58 +0000 |
|---|---|---|
| committer | akr <akr@b2dd03c8-39d4-4d8f-98ff-823fe69b080e> | 2007-12-08 19:10:58 +0000 |
| commit | 78eae5da628492d64f582b577d401b3864b04f16 (patch) | |
| tree | 0952d399ff22121b411c9fbe9b9607987c025efa | |
| parent | 4db4d80357a40690531cd393a79ec6f8f8484cd8 (diff) | |
* encoding.c (rb_enc_precise_mbclen): return needmore if underlying
implementation returns a length longer than e-p.
git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@14144 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
| -rw-r--r-- | ChangeLog | 4 | ||||
| -rw-r--r-- | encoding.c | 6 |
2 files changed, 8 insertions, 2 deletions
@@ -1,7 +1,9 @@ -Sun Dec 9 03:29:02 2007 Tanaka Akira <akr@fsij.org> +Sun Dec 9 04:01:28 2007 Tanaka Akira <akr@fsij.org> * encoding.c (rb_enc_mbclen): return 1 if underlying implementation returns a length longer than e-p. + (rb_enc_precise_mbclen): return needmore if underlying + implementation returns a length longer than e-p. Sat Dec 8 17:59:40 2007 Tanaka Akira <akr@fsij.org> diff --git a/encoding.c b/encoding.c index e902f6db0e..21b56f2636 100644 --- a/encoding.c +++ b/encoding.c @@ -496,9 +496,13 @@ rb_enc_mbclen(const char *p, const char *e, rb_encoding *enc) int rb_enc_precise_mbclen(const char *p, const char *e, rb_encoding *enc) { + int n; if (e <= p) return ONIGENC_CONSTRUCT_MBCLEN_NEEDMORE(1); - return ONIGENC_PRECISE_MBC_ENC_LEN(enc, (UChar*)p, (UChar*)e); + n = ONIGENC_PRECISE_MBC_ENC_LEN(enc, (UChar*)p, (UChar*)e); + if (e-p < n) + return ONIGENC_CONSTRUCT_MBCLEN_NEEDMORE(n-(e-p)); + return n; } int rb_enc_get_ascii(const char *p, const char *e, rb_encoding *enc) |