mirror/zig
1
0
Fork 0
mirror of https://github.com/ziglang/zig.git synced 2025-12-06 14:23:09 +00:00
Code Issues Packages Projects Releases Wiki Activity

std.hash_map: Fix integer overflow bugs (#19048)

Browse Source
This commit is contained in:
Brandon Botsch 2024-02-24 00:56:00 -05:00 committed by GitHub
parent 774487038f
commit 5df6c70a32
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
1 changed files with 6 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
lib/std/hash_map.zig
View File

@ -894,7 +894,7 @@ pub fn HashMapUnmanaged(
} }
fn capacityForSize(size: Size) Size { fn capacityForSize(size: Size) Size {
var new_cap: u32 = @truncate((@as(u64, size) * 100) / max_load_percentage + 1); var new_cap: u32 = @intCast((@as(u64, size) * 100) / max_load_percentage + 1);
new_cap = math.ceilPowerOfTwo(u32, new_cap) catch unreachable; new_cap = math.ceilPowerOfTwo(u32, new_cap) catch unreachable;
return new_cap; return new_cap;
} }
@ -1537,14 +1537,15 @@ pub fn HashMapUnmanaged(
const val_align = if (@sizeOf(V) == 0) 1 else @alignOf(V); const val_align = if (@sizeOf(V) == 0) 1 else @alignOf(V);
const max_align = comptime @max(header_align, key_align, val_align); const max_align = comptime @max(header_align, key_align, val_align);
const meta_size = @sizeOf(Header) + new_capacity * @sizeOf(Metadata); const new_cap: usize = new_capacity;
const meta_size = @sizeOf(Header) + new_cap * @sizeOf(Metadata);
comptime assert(@alignOf(Metadata) == 1); comptime assert(@alignOf(Metadata) == 1);
const keys_start = std.mem.alignForward(usize, meta_size, key_align); const keys_start = std.mem.alignForward(usize, meta_size, key_align);
const keys_end = keys_start + new_capacity * @sizeOf(K); const keys_end = keys_start + new_cap * @sizeOf(K);
const vals_start = std.mem.alignForward(usize, keys_end, val_align); const vals_start = std.mem.alignForward(usize, keys_end, val_align);
const vals_end = vals_start + new_capacity * @sizeOf(V); const vals_end = vals_start + new_cap * @sizeOf(V);
const total_size = std.mem.alignForward(usize, vals_end, max_align); const total_size = std.mem.alignForward(usize, vals_end, max_align);
@ -1572,7 +1573,7 @@ pub fn HashMapUnmanaged(
const val_align = if (@sizeOf(V) == 0) 1 else @alignOf(V); const val_align = if (@sizeOf(V) == 0) 1 else @alignOf(V);
const max_align = comptime @max(header_align, key_align, val_align); const max_align = comptime @max(header_align, key_align, val_align);
const cap = self.capacity(); const cap: usize = self.capacity();
const meta_size = @sizeOf(Header) + cap * @sizeOf(Metadata); const meta_size = @sizeOf(Header) + cap * @sizeOf(Metadata);
comptime assert(@alignOf(Metadata) == 1); comptime assert(@alignOf(Metadata) == 1);