kotovalexarian-likes-github/ruby--ruby
1
0
Fork 0
mirror of https://github.com/ruby/ruby.git synced 2022-11-09 12:17:21 -05:00
Code Releases Activity

* encoding.c (rb_enc_precise_mbclen): return needmore if underlying

Browse source 
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
This commit is contained in:
akr 2007-12-08 19:10:58 +00:00
parent 4db4d80357
commit 78eae5da62
2 changed files with 8 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
ChangeLog
View file

@ -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 * encoding.c (rb_enc_mbclen): return 1 if underlying implementation
returns a length longer than e-p. 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> Sat Dec 8 17:59:40 2007 Tanaka Akira <akr@fsij.org>

6
encoding.c
View file

@ -496,9 +496,13 @@ rb_enc_mbclen(const char *p, const char *e, rb_encoding *enc)
int int
rb_enc_precise_mbclen(const char *p, const char *e, rb_encoding *enc) rb_enc_precise_mbclen(const char *p, const char *e, rb_encoding *enc)
{ {
int n;
if (e <= p) if (e <= p)
return ONIGENC_CONSTRUCT_MBCLEN_NEEDMORE(1); 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) int rb_enc_get_ascii(const char *p, const char *e, rb_encoding *enc)