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

ruby · Mar 13, 2023 · dddc542 · dddc542
1 parent 1e73bdb
commit dddc542
Show file tree

Hide file tree

Showing 2 changed files with 7 additions and 2 deletions.
diff --git a/regexec.c b/regexec.c
@@ -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

diff --git a/test/ruby/test_regexp.rb b/test/ruby/test_regexp.rb
@@ -1765,6 +1765,11 @@ def test_bug_19467
     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']