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

Handling negative indices in String#bytesplice

Browse Source
This commit is contained in:
dearblue
2023-04-15 21:25:59 +09:00
parent dcced0016c
commit 5bc3a48ecb
2 changed files with 12 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/string.c
+7 -1
View File
@@ -2947,7 +2947,13 @@ static mrb_value
str_bytesplice(mrb_state *mrb, mrb_value str, mrb_int idx1, mrb_int len1, mrb_value replace, mrb_int idx2, mrb_int len2)
{
struct RString *s = RSTRING(str);
if (RSTR_LEN(s) < idx1 || RSTRING_LEN(replace) < idx2) {
if (idx1 < 0) {
idx1 += RSTR_LEN(s);
}
if (idx2 < 0) {
idx2 += RSTRING_LEN(replace);
}
if (RSTR_LEN(s) < idx1 || idx1 < 0 || RSTRING_LEN(replace) < idx2 || idx2 < 0) {
mrb_raise(mrb, E_INDEX_ERROR, "index out of string");
}
mrb_int n;
test/t/string.rb
+5
View File
@@ -955,4 +955,9 @@ assert('String#bytesplice') do
# check the overflow to index and length (to be pass without crash)
assert_nothing_raised { "0123456789".bytesplice(8, ~(-1 << 31), "ab") } # for MRB_INT32
assert_nothing_raised { begin; "0123456789".bytesplice(8, ~(-1 << 63), "ab"); rescue ArgumentError, RangeError; end } # for MRB_INT64
# check the negative index
assert_equal "0ab3456789", "0123456789".bytesplice(-9, 2, "ab")
assert_equal "ab23456789", "0123456789".bytesplice(-10, 2, "ab")
assert_raise(IndexError) { "0123456789".bytesplice(-11, 2, "ab") }
end