Commit e4181972470c29f83480fdd6d5a465e1f8d14d7b | zig

author	Andrew Kelley <andrew@ziglang.org> 2025-08-27 18:41:10-07:00
committer	Andrew Kelley <andrew@ziglang.org> 2025-08-28 18:30:57-07:00
log	e4181972470c29f83480fdd6d5a465e1f8d14d7b
tree	3a2c1ae7cd82241b108129348a7e896c5f15486b
parent	5be9df710cb916ca714f73fc8b25d9300c7768f5

2 files changed, 15 insertions(+), 9 deletions(-)

src/link/MachO.zig+14-8

 @@ -3015,24 +3015,30 @@ pub fn writeCodeSignature(self: *MachO, code_sig: *CodeSignature) !void {
     const offset = self.codesig_cmd.dataoff;
     const gpa = self.base.comp.gpa;
-    const buffer = try gpa.alloc(u8, code_sig.size());
+    var buffer: std.Io.Writer.Allocating = .init(gpa);
-    defer gpa.free(buffer);
+    defer buffer.deinit();
-    var writer: Writer = .fixed(buffer);
+    // The writeAdhocSignature function internally changes code_sig.size()
-    try code_sig.writeAdhocSignature(self, .{
+    // during the execution.
+    try buffer.ensureUnusedCapacity(code_sig.size());
+    code_sig.writeAdhocSignature(self, .{
         .file = self.base.file.?,
         .exec_seg_base = seg.fileoff,
         .exec_seg_limit = seg.filesize,
         .file_size = offset,
         .dylib = self.base.isDynLib(),
-    }, &writer);
+    }, &buffer.writer) catch |err| switch (err) {
-    assert(writer.buffered().len == code_sig.size());
+        error.WriteFailed => return error.OutOfMemory,
+        else => |e| return e,
+    };
+    assert(buffer.written().len == code_sig.size());
     log.debug("writing code signature from 0x{x} to 0x{x}", .{
         offset,
-        offset + writer.buffered().len,
+        offset + buffer.written().len,
     });
-    try self.pwriteAll(writer.buffered(), offset);
+    try self.pwriteAll(buffer.written(), offset);
 }
 pub fn updateFunc(

src/link/MachO/CodeSignature.zig+1-1