mirrors/bun.sh
1
0
Fork 0
mirror of https://github.com/oven-sh/bun synced 2026-02-02 15:08:46 +00:00
Code Issues Packages Projects Releases Wiki Activity

fix(macho): only update signature size on ARM64 with codesigning enabled (#26175)

Browse Source 
The signature size adjustment was being applied unconditionally, but it
should only happen when building for ARM64 and codesigning is enabled.
This prevents incorrect offset calculations on non-ARM64 platforms.

---------

Co-authored-by: autofix-ci[bot] <114827586+autofix-ci[bot]@users.noreply.github.com>
This commit is contained in:
Dylan Conway
2026-01-16 14:18:48 -08:00
committed by GitHub
parent 8da29af1ae
commit 6f6f76f0c0
2 changed files with 5 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
src/bun.js/webcore/Request.zig
View File

@@ -1089,8 +1089,8 @@ const string = []const u8;
const Environment = @import("../../env.zig");
const std = @import("std");
const FetchRedirect = @import("../../http/FetchRedirect.zig").FetchRedirect;
const FetchCacheMode = @import("../../http/FetchCacheMode.zig").FetchCacheMode;
const FetchRedirect = @import("../../http/FetchRedirect.zig").FetchRedirect;
const FetchRequestMode = @import("../../http/FetchRequestMode.zig").FetchRequestMode;
const Method = @import("../../http/Method.zig").Method;

2
src/macho.zig
View File

@@ -183,8 +183,10 @@ pub const MachoFile = struct {
// Only update offsets if the size actually changed
if (size_diff != 0) {
if (self.header.cputype == macho.CPU_TYPE_ARM64 and !bun.feature_flag.BUN_NO_CODESIGN_MACHO_BINARY.get()) {
// New signature size is the old size plus the size of the hashes for the new pages
sig_size = sig_size + @as(usize, @intCast(size_of_new_hashes));
}
// We move the offsets of the LINKEDIT segment ahead by `size_diff`
linkedit_seg.fileoff += @as(usize, @intCast(size_diff));