admin/mruby-mruby
1
0
Fork 0
mirror of https://github.com/mruby/mruby synced 2026-06-08 16:11:16 +00:00
Code Issues Packages Projects Releases Wiki Activity

mruby-string-ext (utf8code): change arguments to point at the end

Browse Source
This commit is contained in:
Yukihiro "Matz" Matsumoto
2023-09-24 23:01:33 +09:00
parent 2e3b482aa9
commit 5705d884ce
1 changed files with 11 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files
mrbgems/mruby-string-ext/src/string.c
+11 -10
View File
@@ -1002,8 +1002,8 @@ str_succ(mrb_state *mrb, mrb_value self)
#ifdef MRB_UTF8_STRING
extern const char mrb_utf8len_table[];
static mrb_int
utf8code(unsigned char* p, mrb_int limit)
MRB_INLINE mrb_int
utf8code(const unsigned char* p, const unsigned char *e)
{
mrb_int len;
@@ -1011,7 +1011,7 @@ utf8code(unsigned char* p, mrb_int limit)
return p[0];
len = mrb_utf8len_table[p[0]>>3];
if (len <= limit && len > 1 && (p[1] & 0xc0) == 0x80) {
if (p+len <= e && len > 1 && (p[1] & 0xc0) == 0x80) {
if (len == 2)
return ((p[0] & 0x1f) << 6) + (p[1] & 0x3f);
if ((p[2] & 0xc0) == 0x80) {
@@ -1033,26 +1033,27 @@ str_ord(mrb_state* mrb, mrb_value str)
{
if (RSTRING_LEN(str) == 0)
mrb_raise(mrb, E_ARGUMENT_ERROR, "empty string");
mrb_int c = utf8code((unsigned char*)RSTRING_PTR(str), RSTRING_LEN(str));
const unsigned char *p = (unsigned char*)RSTRING_PTR(str);
const unsigned char *e = p + RSTRING_LEN(str);
mrb_int c = utf8code(p, e);
if (c < 0) mrb_raise(mrb, E_ARGUMENT_ERROR, "invalid UTF-8 byte sequence");
return mrb_fixnum_value(c);
}
static mrb_value
str_codepoints(mrb_state *mrb, mrb_value self)
str_codepoints(mrb_state *mrb, mrb_value str)
{
mrb_value result;
char *p = RSTRING_PTR(self);
mrb_int len = RSTRING_LEN(self);
char *e = p + len;
const unsigned char *p = (unsigned char*)RSTRING_PTR(str);
const unsigned char *e = p + RSTRING_LEN(str);
mrb->c->ci->mid = 0;
result = mrb_ary_new(mrb);
while (p < e) {
mrb_int c = utf8code((unsigned char*)p, len);
mrb_int c = utf8code((unsigned char*)p, e);
mrb_ary_push(mrb, result, mrb_int_value(mrb, c));
mrb_int ulen = mrb_utf8len(p, e);
len -= ulen;
p += ulen;
}
return result;