debug: fixup memory management

kcbanner · kcbanner · commit 5e3cadf871ab · 2023-01-08T22:16:16.000-05:00
diff --git a/lib/std/debug.zig b/lib/std/debug.zig
@@ -838,7 +838,7 @@ pub fn openSelfDebugInfo(allocator: mem.Allocator) OpenSelfDebugInfoError!DebugI
 fn readCoffDebugInfo(allocator: mem.Allocator, coff_bytes: []const u8) !ModuleDebugInfo {
     nosuspend {
         const coff_obj = try allocator.create(coff.Coff);
-        errdefer allocator.destroy(coff_obj);
+        defer allocator.destroy(coff_obj);
         coff_obj.* = try coff.Coff.init(coff_bytes);
 
         var di = ModuleDebugInfo{
@@ -1289,6 +1289,7 @@ pub const DebugInfo = struct {
             self.allocator.destroy(mdi);
         }
         self.address_map.deinit();
+        if (native_os == .windows) self.modules.deinit(self.allocator);
     }
 
     pub fn getModuleForAddress(self: *DebugInfo, address: usize) !*ModuleDebugInfo {

Original file line number	Diff line number	Diff line change
`@@ -838,7 +838,7 @@ pub fn openSelfDebugInfo(allocator: mem.Allocator) OpenSelfDebugInfoError!DebugI`
`838`	`838`	`fn readCoffDebugInfo(allocator: mem.Allocator, coff_bytes: []const u8) !ModuleDebugInfo {`
`839`	`839`	`nosuspend {`
`840`	`840`	`const coff_obj = try allocator.create(coff.Coff);`
`841`		`- errdefer allocator.destroy(coff_obj);`
	`841`	`+ defer allocator.destroy(coff_obj);`
`842`	`842`	`coff_obj.* = try coff.Coff.init(coff_bytes);`
`843`	`843`
`844`	`844`	`var di = ModuleDebugInfo{`
`@@ -1289,6 +1289,7 @@ pub const DebugInfo = struct {`
`1289`	`1289`	`self.allocator.destroy(mdi);`
`1290`	`1290`	`}`
`1291`	`1291`	`self.address_map.deinit();`
	`1292`	`+ if (native_os == .windows) self.modules.deinit(self.allocator);`
`1292`	`1293`	`}`
`1293`	`1294`
`1294`	`1295`	`pub fn getModuleForAddress(self: DebugInfo, address: usize) !ModuleDebugInfo {`