diff options
Diffstat (limited to 'std/heap.zig')
| -rw-r--r-- | std/heap.zig | 25 |
1 files changed, 17 insertions, 8 deletions
diff --git a/std/heap.zig b/std/heap.zig index dd5cfa4cd7..fae6ca1a24 100644 --- a/std/heap.zig +++ b/std/heap.zig @@ -118,14 +118,22 @@ pub const DirectAllocator = struct { } return old_mem[0..new_size]; }, - Os.windows => return realloc(allocator, old_mem, old_align, new_size, new_align) catch { - 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).*; - const old_ptr = @intToPtr(*c_void, root_addr); - const new_record_addr = old_record_addr - new_size + old_mem.len; - @intToPtr(*align(1) usize, new_record_addr).* = root_addr; - return old_mem[0..new_size]; + Os.windows => { + if (new_size == 0) { + const self = @fieldParentPtr(DirectAllocator, "allocator", allocator); + _ = os.windows.HeapFree(self.heap_handle.?, 0, old_mem.ptr); + return old_mem[0..new_size]; + } + + return realloc(allocator, old_mem, old_align, new_size, new_align) catch { + 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).*; + const old_ptr = @intToPtr(*c_void, root_addr); + const new_record_addr = old_record_addr - new_size + old_mem.len; + @intToPtr(*align(1) usize, new_record_addr).* = root_addr; + return old_mem[0..new_size]; + }; }, else => @compileError("Unsupported OS"), } @@ -143,6 +151,7 @@ pub const DirectAllocator = struct { return result; }, Os.windows => { + assert(new_size > 0); if (old_mem.len == 0) return alloc(allocator, new_size, new_align); const self = @fieldParentPtr(DirectAllocator, "allocator", allocator); |