Merge pull request ruby#37 from Shopify/flavorjones-fix-add-incoming-malloc-size

maximecb · web-flow · commit f2ab25db046e · 2021-02-10T10:32:40.000-05:00
fix: ensure add_incoming allocates the proper length memory
diff --git a/ujit_core.c b/ujit_core.c
@@ -172,7 +172,7 @@ static void add_block_version(blockid_t blockid, block_t* block)
 static void add_incoming(block_t* p_block, uint32_t branch_idx)
 {
     // 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);
     new_list[p_block->num_incoming] = branch_idx;
     p_block->incoming = new_list;

Original file line number	Diff line number	Diff line change
`@@ -172,7 +172,7 @@ static void add_block_version(blockid_t blockid, block_t* block)`
`172`	`172`	`static void add_incoming(block_t* p_block, uint32_t branch_idx)`
`173`	`173`	`{`
`174`	`174`	`// Add this branch to the list of incoming branches for the target`
`175`		`- uint32_t* new_list = malloc(sizeof(uint32_t) * p_block->num_incoming + 1);`
	`175`	`+ uint32_t* new_list = malloc(sizeof(uint32_t) * (p_block->num_incoming + 1));`
`176`	`176`	`memcpy(new_list, p_block->incoming, p_block->num_incoming);`
`177`	`177`	`new_list[p_block->num_incoming] = branch_idx;`
`178`	`178`	`p_block->incoming = new_list;`