diff options
author | Peter Zhu <[email protected]> | 2024-07-25 15:28:25 -0400 |
---|---|---|
committer | Peter Zhu <[email protected]> | 2024-07-26 08:42:38 -0400 |
commit | 7464514ca5e825ada31522b63a33e02d62a0a248 (patch) | |
tree | e27e1fe961c8cfc3b03ec103f30fb41af0c3a7c5 /test/ruby/test_string.rb | |
parent | 67e1ea002857b5c2115cd362f9230f3f4b432223 (diff) |
Fix memory leak in String#start_with? when regexp times out
[Bug #20653]
This commit refactors how Onigmo handles timeout. Instead of raising a
timeout error, onig_search will return a ONIGERR_TIMEOUT which the
caller can free memory, and then raise a timeout error.
This fixes a memory leak in String#start_with when the regexp times out.
For example:
regex = Regexp.new("^#{"(a*)" * 10_000}x$", timeout: 0.000001)
str = "a" * 1000000 + "x"
10.times do
100.times do
str.start_with?(regex)
rescue
end
puts `ps -o rss= -p #{$$}`
end
Before:
33216
51936
71152
81728
97152
103248
120384
133392
133520
133616
After:
14912
15376
15824
15824
16128
16128
16144
16144
16160
16160
Notes
Notes:
Merged: https://github.com/ruby/ruby/pull/11247
Diffstat (limited to 'test/ruby/test_string.rb')
-rw-r--r-- | test/ruby/test_string.rb | 16 |
1 files changed, 16 insertions, 0 deletions
diff --git a/test/ruby/test_string.rb b/test/ruby/test_string.rb index 9bd86dfb78..7b3d63dd1b 100644 --- a/test/ruby/test_string.rb +++ b/test/ruby/test_string.rb @@ -1971,6 +1971,22 @@ CODE assert_nil($&) end + def test_start_with_timeout_memory_leak + assert_no_memory_leak([], "#{<<~"begin;"}", "#{<<~'end;'}", "[Bug #20653]", rss: true) + regex = Regexp.new("^#{"(a*)" * 10_000}x$", timeout: 0.000001) + str = "a" * 1_000_000 + "x" + + code = proc do + str.start_with?(regex) + rescue + end + + 10.times(&code) + begin; + 1_000.times(&code) + end; + end + def test_strip assert_equal(S("x"), S(" x ").strip) assert_equal(S("x"), S(" \n\r\t x \t\r\n\n ").strip) |