1berry/ruby
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

* encoding.c (rb_enc_codelen): raises invalid sequence exception

Browse Source 
if ONIGENC_CODE_TO_MBCLEN() returns zero.  [ruby-dev:31661]

* encoding.c (rb_enc_mbclen): check invalid sequence.

git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@13287 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
This commit is contained in:
matz 2007-08-27 13:48:09 +00:00
parent a1a618ead1
commit 4461bd2f1f
3 changed files with 31 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
ChangeLog
View File

@ -1,3 +1,10 @@
Mon Aug 27 22:39:08 2007 Yukihiro Matsumoto <matz@ruby-lang.org>
* 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.
Mon Aug 27 20:27:59 2007 Masaki Suketa <masaki.suketa@nifty.ne.jp> Mon Aug 27 20:27:59 2007 Masaki Suketa <masaki.suketa@nifty.ne.jp>
* ext/win32ole/win32ole.c (ole_type_progid): fix the bug. * ext/win32ole/win32ole.c (ole_type_progid): fix the bug.

20
encoding.c
View File

@ -216,6 +216,26 @@ rb_enc_strlen(const char *p, const char *e, rb_encoding *enc)
return c; 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 int
rb_enc_toupper(int c, rb_encoding *enc) rb_enc_toupper(int c, rb_encoding *enc)
{ {

6
include/ruby/encoding.h
View File

@ -50,8 +50,10 @@ rb_encoding * rb_enc_find(const char *name);
#define rb_enc_mbmaxlen(enc) (enc)->max_enc_len #define rb_enc_mbmaxlen(enc) (enc)->max_enc_len
/* ptr,encoding -> mbclen */ /* ptr,encoding -> mbclen */
#define rb_enc_mbclen(p,enc) ONIGENC_MBC_ENC_LEN(enc, (UChar*)p) int rb_enc_mbclen(const char*, rb_encoding*);
#define rb_enc_codelen(c,enc) ONIGENC_CODE_TO_MBCLEN(enc,c)
/* code,encoding -> codelen */
int rb_enc_codelen(int, rb_encoding*);
/* code,ptr,encoding -> write buf */ /* code,ptr,encoding -> write buf */
#define rb_enc_mbcput(c,buf,enc) ONIGENC_CODE_TO_MBC(enc,c,(UChar*)buf) #define rb_enc_mbcput(c,buf,enc) ONIGENC_CODE_TO_MBC(enc,c,(UChar*)buf)