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

[Bug #19748] Fix out-of-bound access in String#byteindex

Browse Source
This commit is contained in:
Nobuyoshi Nakada 2023-06-28 14:44:01 +09:00
parent 715c5ca4a4
commit bc3ac1872e
2 changed files with 10 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

17
string.c
View File

@ -3970,20 +3970,21 @@ rb_str_byteindex_m(int argc, VALUE *argv, VALUE str)
long pos; long pos;
if (rb_scan_args(argc, argv, "11", &sub, &initpos) == 2) { if (rb_scan_args(argc, argv, "11", &sub, &initpos) == 2) {
long slen = RSTRING_LEN(str);
pos = NUM2LONG(initpos); pos = NUM2LONG(initpos);
}
else {
pos = 0;
}
if (pos < 0) {
pos += RSTRING_LEN(str);
if (pos < 0) { if (pos < 0) {
pos += slen;
}
if (pos < 0 || pos > slen) {
if (RB_TYPE_P(sub, T_REGEXP)) { if (RB_TYPE_P(sub, T_REGEXP)) {
rb_backref_set(Qnil); rb_backref_set(Qnil);
} }
return Qnil; return Qnil;
} }
} }
else {
pos = 0;
}
if (!str_check_byte_pos(str, pos)) { if (!str_check_byte_pos(str, pos)) {
rb_raise(rb_eIndexError, rb_raise(rb_eIndexError,
@ -3991,10 +3992,6 @@ rb_str_byteindex_m(int argc, VALUE *argv, VALUE str)
} }
if (RB_TYPE_P(sub, T_REGEXP)) { if (RB_TYPE_P(sub, T_REGEXP)) {
if (pos > RSTRING_LEN(str)) {
rb_backref_set(Qnil);
return Qnil;
}
if (rb_reg_search(sub, str, pos, 0) < 0) { if (rb_reg_search(sub, str, pos, 0) < 0) {
return Qnil; return Qnil;
} }

3
test/ruby/test_string.rb
View File

@ -3397,6 +3397,9 @@ CODE
assert_byteindex(6, S("にんにちは"), S("に"), 6) assert_byteindex(6, S("にんにちは"), S("に"), 6)
assert_byteindex(6, S("にんにちは"), /に./, 6) assert_byteindex(6, S("にんにちは"), /に./, 6)
assert_raise(IndexError) { S("にんにちは").byteindex(?に, 7) } assert_raise(IndexError) { S("にんにちは").byteindex(?に, 7) }
s = S("foobarbarbaz")
assert !1000.times.any? {s.byteindex("", 100_000_000)}
end end
def test_byterindex def test_byterindex