From 01fb42103115a58c4b693a600dc5379fedb4ea86 Mon Sep 17 00:00:00 2001 From: Andrew Kelley Date: Fri, 15 Mar 2019 18:57:07 -0400 Subject: [PATCH] fix regressions on Windows from previous commit --- std/heap.zig | 3 ++- std/os/windows/util.zig | 2 +- 2 files changed, 3 insertions(+), 2 deletions(-) diff --git a/std/heap.zig b/std/heap.zig index 84ed469763..dd5cfa4cd7 100644 --- a/std/heap.zig +++ b/std/heap.zig @@ -143,8 +143,9 @@ pub const DirectAllocator = struct { return result; }, Os.windows => { - const self = @fieldParentPtr(DirectAllocator, "allocator", allocator); + if (old_mem.len == 0) return alloc(allocator, new_size, new_align); + const self = @fieldParentPtr(DirectAllocator, "allocator", allocator); const old_adjusted_addr = @ptrToInt(old_mem.ptr); const old_record_addr = old_adjusted_addr + old_mem.len; const root_addr = @intToPtr(*align(1) usize, old_record_addr).*; diff --git a/std/os/windows/util.zig b/std/os/windows/util.zig index 24039967a1..72c84502e3 100644 --- a/std/os/windows/util.zig +++ b/std/os/windows/util.zig @@ -197,7 +197,7 @@ pub fn createWindowsEnvBlock(allocator: *mem.Allocator, env_map: *const BufMap) i += 1; result[i] = 0; i += 1; - return allocator.shrink(u16, result, i); + return allocator.shrink(result, i); } pub fn windowsFindFirstFile(