зеркало из https://github.com/github/ruby.git
Resize ary when `Array#sort!` block modifies embedded ary
In cases where `rb_ary_sort_bang` is called with a block and tmp is an embedded array, we need to account for the block potentially impacting the capacity of ary. ex: ``` var_0 = (1..70).to_a var_0.sort! do |var_0_block_129, var_1_block_129| var_0.pop var_1_block_129 <=> var_0_block_129 end.shift(3) ``` The above example can put the array into a corrupted state resulting in a heap buffer overflow and possible segfault: ``` ERROR: AddressSanitizer: heap-buffer-overflow on address [...] WRITE of size 560 at 0x60b0000034f0 thread T0 [...] ``` This commit adds a conditional to determine when the capacity of ary has been modified by the provided block. If this is the case, ensure that the capacity of ary is adjusted to handle at minimum the len of tmp.
This commit is contained in:
Родитель
66554a5025
Коммит
95ae4196c6
3
array.c
3
array.c
|
@ -3387,6 +3387,9 @@ rb_ary_sort_bang(VALUE ary)
|
|||
rb_ary_unshare(ary);
|
||||
FL_SET_EMBED(ary);
|
||||
}
|
||||
if (ARY_EMBED_LEN(tmp) > ARY_CAPA(ary)) {
|
||||
ary_resize_capa(ary, ARY_EMBED_LEN(tmp));
|
||||
}
|
||||
ary_memcpy(ary, 0, ARY_EMBED_LEN(tmp), ARY_EMBED_PTR(tmp));
|
||||
ARY_SET_LEN(ary, ARY_EMBED_LEN(tmp));
|
||||
}
|
||||
|
|
|
@ -3555,6 +3555,15 @@ class TestArray < Test::Unit::TestCase
|
|||
assert_equal(10000, eval(lit).size)
|
||||
end
|
||||
|
||||
def test_array_safely_modified_by_sort_block
|
||||
var_0 = (1..70).to_a
|
||||
var_0.sort! do |var_0_block_129, var_1_block_129|
|
||||
var_0.pop
|
||||
var_1_block_129 <=> var_0_block_129
|
||||
end.shift(3)
|
||||
assert_equal((1..67).to_a.reverse, var_0)
|
||||
end
|
||||
|
||||
private
|
||||
def need_continuation
|
||||
unless respond_to?(:callcc, true)
|
||||
|
|
Загрузка…
Ссылка в новой задаче