mirror/zig
1
0
Fork 0
mirror of https://github.com/ziglang/zig.git synced 2026-01-20 14:25:16 +00:00
Code Issues Packages Projects Releases Wiki Activity

std.mem.Allocator: do not return undefined pointers

Browse Source
This commit is contained in:
Veikka Tuominen 2022-10-25 16:09:51 +03:00
parent d9fe5ba7f8
commit 5b79f42dc5
1 changed files with 6 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
lib/std/mem/Allocator.zig
View File

@ -286,7 +286,8 @@ pub fn allocAdvancedWithRetAddr(
} else @alignOf(T);
if (n == 0) {
return @as([*]align(a) T, undefined)[0..0];
const ptr = comptime std.mem.alignBackward(std.math.maxInt(usize), a);
return @intToPtr([*]align(a) T, ptr)[0..0];
}
const byte_count = math.mul(usize, @sizeOf(T), n) catch return Error.OutOfMemory;
@ -383,7 +384,8 @@ pub fn reallocAdvancedWithRetAddr(
}
if (new_n == 0) {
self.free(old_mem);
return @as([*]align(new_alignment) T, undefined)[0..0];
const ptr = comptime std.mem.alignBackward(std.math.maxInt(usize), new_alignment);
return @intToPtr([*]align(new_alignment) T, ptr)[0..0];
}
const old_byte_slice = mem.sliceAsBytes(old_mem);
@ -462,7 +464,8 @@ pub fn alignedShrinkWithRetAddr(
return old_mem;
if (new_n == 0) {
self.free(old_mem);
return @as([*]align(new_alignment) T, undefined)[0..0];
const ptr = comptime std.mem.alignBackward(std.math.maxInt(usize), new_alignment);
return @intToPtr([*]align(new_alignment) T, ptr)[0..0];
}
assert(new_n < old_mem.len);