std.heap.PageAllocator: add check for large allocation

Instead of making the memory alignment functions more complicated, I
added more API documentation for their existing semantics.

closes #12118
closes #12135
This commit is contained in:
Andrew Kelley 2022-10-30 16:10:20 -07:00
parent 9b54c9dee8
commit 3f3003097c
3 changed files with 13 additions and 0 deletions

View File

@ -260,6 +260,9 @@ const PageAllocator = struct {
fn alloc(_: *anyopaque, n: usize, alignment: u29, len_align: u29, ra: usize) error{OutOfMemory}![]u8 {
_ = ra;
assert(n > 0);
if (n > maxInt(usize) - (mem.page_size - 1)) {
return error.OutOfMemory;
}
const aligned_len = mem.alignForward(n, mem.page_size);
if (builtin.os.tag == .windows) {

View File

@ -971,6 +971,14 @@ test "large allocations" {
allocator.free(ptr2);
}
test "very large allocation" {
var gpa = GeneralPurposeAllocator(test_config){};
defer std.testing.expect(!gpa.deinit()) catch @panic("leak");
const allocator = gpa.allocator();
try std.testing.expectError(error.OutOfMemory, allocator.alloc(u8, math.maxInt(usize)));
}
test "realloc" {
var gpa = GeneralPurposeAllocator(test_config){};
defer std.testing.expect(!gpa.deinit()) catch @panic("leak");

View File

@ -3551,12 +3551,14 @@ test "sliceAsBytes preserves pointer attributes" {
/// Round an address up to the next (or current) aligned address.
/// The alignment must be a power of 2 and greater than 0.
/// Asserts that rounding up the address does not cause integer overflow.
pub fn alignForward(addr: usize, alignment: usize) usize {
return alignForwardGeneric(usize, addr, alignment);
}
/// Round an address up to the next (or current) aligned address.
/// The alignment must be a power of 2 and greater than 0.
/// Asserts that rounding up the address does not cause integer overflow.
pub fn alignForwardGeneric(comptime T: type, addr: T, alignment: T) T {
return alignBackwardGeneric(T, addr + (alignment - 1), alignment);
}