kotovalexarian-likes-github/ruby--ruby
1
0
Fork 0
mirror of https://github.com/ruby/ruby.git synced 2022-11-09 12:17:21 -05:00
Code Releases Activity

fix: ensure add_incoming allocates the proper length memory

Browse source 
Without this fix, valgrind reports for zero-length blocks:

==149294== Invalid write of size 4
==149294==    at 0x408121: add_incoming (ujit_core.c:173)
==149294==    by 0x408121: gen_block_version (ujit_core.c:286)
==149294==    by 0x40873C: gen_entry_point (ujit_core.c:303)
==149294==    by 0x3609DF: rb_ujit_compile_iseq (ujit_iface.c:319)
==149294==    by 0x33BD2F: mjit_exec (mjit.h:158)
==149294==    by 0x33BD2F: rb_vm_exec (vm.c:2167)
...
==149294==  Address 0x11278850 is 0 bytes inside a block of size 1 alloc'd
==149294==    at 0x483B7F3: malloc (in /usr/lib/x86_64-linux-gnu/valgrind/vgpreload_memcheck-amd64-linux.so)
==149294==    by 0x40811B: add_incoming (ujit_core.c:171)
==149294==    by 0x40811B: gen_block_version (ujit_core.c:286)
==149294==    by 0x40873C: gen_entry_point (ujit_core.c:303)
==149294==    by 0x3609DF: rb_ujit_compile_iseq (ujit_iface.c:319)
==149294==    by 0x33BD2F: mjit_exec (mjit.h:158)
==149294==    by 0x33BD2F: rb_vm_exec (vm.c:2167)
This commit is contained in:
Mike Dalessio 2021-02-10 09:24:04 -05:00 • committed by Alan Wu
parent a8827e5c5f
commit 99d285a75c
1 changed files with 1 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
ujit_core.c
View file

@ -175,7 +175,7 @@ static void add_block_version(blockid_t blockid, block_t* block)
static void add_incoming(block_t* p_block, uint32_t branch_idx) static void add_incoming(block_t* p_block, uint32_t branch_idx)
{ {
// Add this branch to the list of incoming branches for the target // Add this branch to the list of incoming branches for the target
uint32_t* new_list = malloc(sizeof(uint32_t) * p_block->num_incoming + 1); uint32_t* new_list = malloc(sizeof(uint32_t) * (p_block->num_incoming + 1));
memcpy(new_list, p_block->incoming, p_block->num_incoming); memcpy(new_list, p_block->incoming, p_block->num_incoming);
new_list[p_block->num_incoming] = branch_idx; new_list[p_block->num_incoming] = branch_idx;
p_block->incoming = new_list; p_block->incoming = new_list;