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 /regexec.c | |
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 'regexec.c')
-rw-r--r-- | regexec.c | 3 |
1 files changed, 1 insertions, 2 deletions
@@ -5575,8 +5575,7 @@ onig_search_gpos(regex_t* reg, const UChar* str, const UChar* end, timeout: MATCH_ARG_FREE(msa); - onig_region_free(region, false); - HANDLE_REG_TIMEOUT_IN_MATCH_AT; + return ONIGERR_TIMEOUT; } extern OnigPosition |