Commit ef9fb428b7433238b9c0bd38d3ff36accf0f3d12 | zig

author	zhylmzr <zhylmzr@gmail.com> 2024-04-24 17:17:47+08:00
committer	Andrew Kelley <andrew@ziglang.org> 2024-05-01 12:04:03-07:00
log	ef9fb428b7433238b9c0bd38d3ff36accf0f3d12
tree	6cb8338c0d60e344b615041b95146fa422d3c209
parent	600b652825ef4e1360f6e9d6ad5a20c32fada5ca

fix: object size error in archive

4 files changed, 16 insertions(+), 8 deletions(-)

src
- link
  - Elf
    Archive.zig
    Object.zig
  - MachO
    Archive.zig
    Object.zig

src/link/Elf/Archive.zig+1

...	...	@@ -64,6 +64,7 @@ pub fn parse(self: Archive, elf_file: Elf, path: []const u8, handle_index: Fil
64	64	.archive = .{
65	65	.path = try gpa.dupe(u8, path),
66	66	.offset = pos,
	67	.size = obj_size,
67	68	},
68	69	.path = try gpa.dupe(u8, name),
69	70	.file_handle = handle_index,

src/link/Elf/Object.zig+7-4

...	...	@@ -1009,13 +1009,15 @@ pub fn updateArSymtab(self: Object, ar_symtab: Archive.ArSymtab, elf_file: Elf
1009	1009	}
1010	1010
1011	1011	pub fn updateArSize(self: Object, elf_file: Elf) !void {
1012		const handle = elf_file.fileHandle(self.file_handle);
1013		const size = (try handle.stat()).size;
1014		self.output_ar_state.size = size;
	1012	self.output_ar_state.size = if (self.archive) \|ar\| ar.size else size: {
	1013	const handle = elf_file.fileHandle(self.file_handle);
	1014	break :size (try handle.stat()).size;
	1015	};
1015	1016	}
1016	1017
1017	1018	pub fn writeAr(self: Object, elf_file: *Elf, writer: anytype) !void {
1018	1019	const size = std.math.cast(usize, self.output_ar_state.size) orelse return error.Overflow;
	1020	const offset: u64 = if (self.archive) \|ar\| ar.offset else 0;
1019	1021	const name = self.path;
1020	1022	const hdr = Archive.setArHdr(.{
1021	1023	.name = if (name.len <= Archive.max_member_name_len)
...	...	@@ -1029,7 +1031,7 @@ pub fn writeAr(self: Object, elf_file: *Elf, writer: anytype) !void {
1029	1031	const gpa = elf_file.base.comp.gpa;
1030	1032	const data = try gpa.alloc(u8, size);
1031	1033	defer gpa.free(data);
1032		const amt = try handle.preadAll(data, 0);
	1034	const amt = try handle.preadAll(data, offset);
1033	1035	if (amt != size) return error.InputOutput;
1034	1036	try writer.writeAll(data);
1035	1037	}
...	...	@@ -1349,6 +1351,7 @@ fn formatPath(
1349	1351	const InArchive = struct {
1350	1352	path: []const u8,
1351	1353	offset: u64,
	1354	size: u32,
1352	1355	};
1353	1356
1354	1357	const Object = @This();

src/link/MachO/Archive.zig+1

...	...	@@ -70,6 +70,7 @@ pub fn parse(self: Archive, macho_file: MachO, path: []const u8, handle_index:
70	70	.archive = .{
71	71	.path = try gpa.dupe(u8, path),
72	72	.offset = pos,
	73	.size = hdr_size,
73	74	},
74	75	.path = try gpa.dupe(u8, name),
75	76	.file_handle = handle_index,

src/link/MachO/Object.zig+7-4

...	...	@@ -34,6 +34,7 @@ output_ar_state: Archive.ArState = .{},
34	34	const InArchive = struct {
35	35	path: []const u8,
36	36	offset: u64,
	37	size: u32,
37	38	};
38	39
39	40	pub fn isObject(path: []const u8) !bool {
...	...	@@ -1330,14 +1331,16 @@ pub fn updateArSymtab(self: Object, ar_symtab: Archive.ArSymtab, macho_file: M
1330	1331	}
1331	1332
1332	1333	pub fn updateArSize(self: Object, macho_file: MachO) !void {
1333		const file = macho_file.getFileHandle(self.file_handle);
1334		const size = (try file.stat()).size;
1335		self.output_ar_state.size = size;
	1334	self.output_ar_state.size = if (self.archive) \|ar\| ar.size else size: {
	1335	const file = macho_file.getFileHandle(self.file_handle);
	1336	break :size (try file.stat()).size;
	1337	};
1336	1338	}
1337	1339
1338	1340	pub fn writeAr(self: Object, ar_format: Archive.Format, macho_file: *MachO, writer: anytype) !void {
1339	1341	// Header
1340	1342	const size = std.math.cast(usize, self.output_ar_state.size) orelse return error.Overflow;
	1343	const offset: u64 = if (self.archive) \|ar\| ar.offset else 0;
1341	1344	try Archive.writeHeader(self.path, size, ar_format, writer);
1342	1345	// Data
1343	1346	const file = macho_file.getFileHandle(self.file_handle);
...	...	@@ -1345,7 +1348,7 @@ pub fn writeAr(self: Object, ar_format: Archive.Format, macho_file: *MachO, writ
1345	1348	const gpa = macho_file.base.comp.gpa;
1346	1349	const data = try gpa.alloc(u8, size);
1347	1350	defer gpa.free(data);
1348		const amt = try file.preadAll(data, 0);
	1351	const amt = try file.preadAll(data, offset);
1349	1352	if (amt != size) return error.InputOutput;
1350	1353	try writer.writeAll(data);
1351	1354	}