From ec0846a00fd3d0ae0b7b94961f855b8ab6c938db Mon Sep 17 00:00:00 2001 From: Andrew Kelley Date: Mon, 12 Feb 2018 03:21:18 -0500 Subject: [PATCH] std.heap.ArenaAllocator: fix incorrectly activating safety check --- std/heap.zig | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/std/heap.zig b/std/heap.zig index f309a08a8a..ca6736af1e 100644 --- a/std/heap.zig +++ b/std/heap.zig @@ -232,7 +232,7 @@ pub const ArenaAllocator = struct { var cur_node = if (self.buffer_list.last) |last_node| last_node else try self.createNode(0, n + alignment); while (true) { const cur_buf = cur_node.data[@sizeOf(BufNode)..]; - const addr = @ptrToInt(&cur_buf[self.end_index]); + const addr = @ptrToInt(cur_buf.ptr) + self.end_index; const rem = @rem(addr, alignment); const march_forward_bytes = if (rem == 0) 0 else (alignment - rem); const adjusted_index = self.end_index + march_forward_bytes;