From 7145064efde75aaf4711671d1f5461ea56040815 Mon Sep 17 00:00:00 2001
From: Jakub Konka <kubkon@jakubkonka.com>
Date: Tue, 8 Nov 2022 15:45:15 +0100
Subject: [PATCH] macho: fix parsing len of DW_FORM_string

---
 src/link/MachO/DwarfInfo.zig | 23 ++++++++++++++++-------
 1 file changed, 16 insertions(+), 7 deletions(-)

diff --git a/src/link/MachO/DwarfInfo.zig b/src/link/MachO/DwarfInfo.zig
index 48c5782571..dad248f60e 100644
--- a/src/link/MachO/DwarfInfo.zig
+++ b/src/link/MachO/DwarfInfo.zig
@@ -257,13 +257,21 @@ pub const Attribute = struct {
     }
 
     pub fn getString(self: Attribute, ctx: DwarfInfo, cuh: CompileUnit.Header) ?[]const u8 {
-        if (self.form != dwarf.FORM.strp) return null;
         const debug_info = self.getDebugInfo(ctx);
-        const off = if (cuh.is_64bit)
-            mem.readIntLittle(u64, debug_info[0..8])
-        else
-            mem.readIntLittle(u32, debug_info[0..4]);
-        return ctx.getString(off);
+
+        switch (self.form) {
+            dwarf.FORM.string => {
+                return mem.sliceTo(@ptrCast([*:0]const u8, debug_info.ptr), 0);
+            },
+            dwarf.FORM.strp => {
+                const off = if (cuh.is_64bit)
+                    mem.readIntLittle(u64, debug_info[0..8])
+                else
+                    mem.readIntLittle(u32, debug_info[0..4]);
+                return ctx.getString(off);
+            },
+            else => return null,
+        }
     }
 
     pub fn getConstant(self: Attribute, ctx: DwarfInfo) !?i128 {
@@ -440,8 +448,9 @@ fn findFormSize(self: DwarfInfo, form: u64, di_off: usize, cuh: CompileUnit.Head
 
         dwarf.FORM.string => {
             var count: usize = 0;
-            while (true) : (count += 1) {
+            while (true) {
                 const byte = try reader.readByte();
+                count += 1;
                 if (byte == 0x0) break;
             }
             return count;