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/string.c: check sequence length before decoding.

Browse Source
This commit is contained in:
Yukihiro "Matz" Matsumoto
2022-05-25 11:20:29 +09:00
parent f08e66e53e
commit 2f4695b759
1 changed files with 3 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files
mrbgems/mruby-string-ext/src/string.c
+3 -3
View File
@@ -1002,7 +1002,7 @@ static const char utf8len_codepage_zero[256] =
};
static mrb_int
utf8code(unsigned char* p)
utf8code(unsigned char* p, mrb_int limit)
{
mrb_int len;
@@ -1010,7 +1010,7 @@ utf8code(unsigned char* p)
return p[0];
len = utf8len_codepage_zero[p[0]];
if (len > 1 && (p[1] & 0xc0) == 0x80) {
if (len <= limit && len > 1 && (p[1] & 0xc0) == 0x80) {
if (len == 2)
return ((p[0] & 0x1f) << 6) + (p[1] & 0x3f);
if ((p[2] & 0xc0) == 0x80) {
@@ -1042,7 +1042,7 @@ mrb_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));
mrb_int c = utf8code((unsigned char*)RSTRING_PTR(str), RSTRING_LEN(str));
if (c < 0) mrb_raise(mrb, E_ARGUMENT_ERROR, "invalid UTF-8 byte sequence");
return mrb_fixnum_value(c);
}