From a0baa26c20888ce237cd23ca69952cbc1d88f11b Mon Sep 17 00:00:00 2001 From: matz Date: Mon, 27 Aug 2007 13:48:09 +0000 Subject: * encoding.c (rb_enc_codelen): raises invalid sequence exception if ONIGENC_CODE_TO_MBCLEN() returns zero. [ruby-dev:31661] * encoding.c (rb_enc_mbclen): check invalid sequence. git-svn-id: http://svn.ruby-lang.org/repos/ruby/trunk@13287 b2dd03c8-39d4-4d8f-98ff-823fe69b080e --- encoding.c | 20 ++++++++++++++++++++ 1 file changed, 20 insertions(+) (limited to 'encoding.c') diff --git a/encoding.c b/encoding.c index eed384fb0..fc0aa3b94 100644 --- a/encoding.c +++ b/encoding.c @@ -216,6 +216,26 @@ rb_enc_strlen(const char *p, const char *e, rb_encoding *enc) return c; } +int +rb_enc_mbclen(const char *p, rb_encoding *enc) +{ + int n = ONIGENC_MBC_ENC_LEN(enc, (UChar*)p); + if (n == 0) { + rb_raise(rb_eArgError, "invalid mbstring sequence"); + } + return n; +} + +int +rb_enc_codelen(int c, rb_encoding *enc) +{ + int n = ONIGENC_CODE_TO_MBCLEN(enc,c); + if (n == 0) { + rb_raise(rb_eArgError, "invalid mbstring sequence"); + } + return n; +} + int rb_enc_toupper(int c, rb_encoding *enc) { -- cgit