zig

commit 01fb42103115a58c4b693a600dc5379fedb4ea86 (tree)
parent 9c13e9b7ed9806d0f9774433d5e24359aff1b238
Author: Andrew Kelley <andrew@ziglang.org>
Date:   Fri, 15 Mar 2019 18:57:07 -0400

fix regressions on Windows from previous commit

Diffstat:
M
std/heap.zig
 | 
3
++-
M
std/os/windows/util.zig
 | 
2
+-

2 files changed, 3 insertions(+), 2 deletions(-)
diff --git 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
@@ -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(