language-servers/roc
1
0
Fork 0
mirror of https://github.com/roc-lang/roc.git synced 2025-08-04 12:18:19 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions 7

fix memory leak in List.concat

Browse source
This commit is contained in:
Folkert 2023-01-26 20:31:33 +01:00
parent 212dfdf842
commit 0af11c210e
No known key found for this signature in database
GPG key ID: 1F17F6FFD112B97C
2 changed files with 22 additions and 5 deletions
Download patch file Download diff file Expand all files Collapse all files

10
crates/compiler/builtins/bitcode/src/list.zig
View file

@ -128,7 +128,7 @@ pub const RocList = extern struct {
@memcpy(new_bytes, old_bytes, number_of_bytes);
// NOTE we fuse an increment of all keys/values with a decrement of the input dict
const data_bytes = self.len() * element_width;
const data_bytes = self.capacity * element_width;
utils.decref(self.bytes, data_bytes, alignment);
return new_list;
@ -164,7 +164,7 @@ pub const RocList = extern struct {
return RocList{ .bytes = self.bytes, .length = new_length, .capacity = self.capacity };
} else {
const new_capacity = utils.calculateCapacity(self.capacity, new_length, element_width);
const new_source = utils.unsafeReallocate(source_ptr, alignment, self.len(), new_capacity, element_width);
const new_source = utils.unsafeReallocate(source_ptr, alignment, self.capacity, new_capacity, element_width);
return RocList{ .bytes = new_source, .length = new_length, .capacity = new_capacity };
}
}
@ -787,7 +787,7 @@ pub fn listConcat(list_a: RocList, list_b: RocList, alignment: u32, element_widt
@memcpy(source_b, source_a, byte_count_a);
// decrement list a.
utils.decref(source_a, list_a.len(), alignment);
utils.decref(source_a, list_a.capacity, alignment);
return resized_list_b;
}
@ -804,8 +804,8 @@ pub fn listConcat(list_a: RocList, list_b: RocList, alignment: u32, element_widt
@memcpy(target + list_a.len() * element_width, source_b, list_b.len() * element_width);
// decrement list a and b.
utils.decref(source_a, list_a.len(), alignment);
utils.decref(source_b, list_b.len(), alignment);
utils.decref(source_a, list_a.capacity, alignment);
utils.decref(source_b, list_b.capacity, alignment);
return output;
}

17
crates/valgrind/src/lib.rs
View file

@ -294,3 +294,20 @@ fn str_trim_left_capacity() {
"#
));
}
#[test]
fn str_concat_later_referencing_empty_list_with_capacity() {
valgrind_test(indoc!(
r#"
(
a : List U8
a = List.withCapacity 1
List.concat a [58]
|> List.len
|> Num.addWrap (List.len a)
|> Num.toStr
)
"#
));
}