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

[Bug #19476]: correct cache index computation for repetition (#7457)

Browse Source
This commit is contained in:
TSUYUSATO Kitsune 2023-03-13 18:31:13 +09:00 committed by GitHub
parent 1e73bdbfc4
commit dddc542e9b
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
Notes: git 2023-03-13 09:31:33 +00:00 
Merged-By: makenowjust <make.just.on@gmail.com>
2 changed files with 7 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
regexec.c
View File

@ -1248,10 +1248,10 @@ find_cache_index_table(regex_t* reg, OnigStackType *stk, OnigStackIndex *repeat_
}
if (range->upper == 0x7fffffff) {
return range->base_num + range->inner_num * range->lower + (is_inc ? 0 : 1) + item->num;
return range->base_num + range->inner_num * (range->lower - (is_inc ? 1 : 0)) + (is_inc ? 0 : 1) + item->num;
}
return range->base_num + range->inner_num * range->lower + (range->inner_num + 1) * (count - range->lower) + item->num;
return range->base_num + range->inner_num * (range->lower - 1) + (range->inner_num + 1) * (count - range->lower + 1) + item->num;
}
static void

5
test/ruby/test_regexp.rb
View File

@ -1765,6 +1765,11 @@ class TestRegexp < Test::Unit::TestCase
end;
end
def test_bug_19476 # [Bug #19476]
assert_equal("123456789".match(/(?:x?\dx?){2,10}/)[0], "123456789")
assert_equal("123456789".match(/(?:x?\dx?){2,}/)[0], "123456789")
end
def test_linear_time_p
assert_send [Regexp, :linear_time?, /a/]
assert_send [Regexp, :linear_time?, 'a']