* encoding.h (rb_enc_mbc_to_codepoint): wrapper for

  ONIGENC_MBC_TO_CODE().

* string.c (rb_str_succ): deal with invalid sequence as binary.


git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@14692 b2dd03c8-39d4-4d8f-98ff-823fe69b080e

1 files changed, 3 insertions, 2 deletions

diff --git a/encoding.c b/encoding.c
index ee0fdadb39..ea00deb9e2 100644
--- a/encoding.c
+++ b/encoding.c
@@ -660,14 +660,15 @@ rb_enc_ascget(const char *p, const char *e, int *len, rb_encoding *enc)
     return c;
 }
 
-int rb_enc_codepoint(const char *p, const char *e, rb_encoding *enc)
+int
+rb_enc_codepoint(const char *p, const char *e, rb_encoding *enc)
 {
     int r;
     if (e <= p)
         rb_raise(rb_eArgError, "empty string");
     r = rb_enc_precise_mbclen(p, e, enc);
     if (MBCLEN_CHARFOUND(r))
-        return ONIGENC_MBC_TO_CODE(enc,(UChar*)p,(UChar*)e);
+        return rb_enc_mbc_to_codepoint(p, e, enc);
     else
 	rb_raise(rb_eArgError, "invalid mbstring sequence");
 }