diff options
| -rw-r--r-- | src/link/Wasm.zig | 3 | ||||
| -rw-r--r-- | src/link/Wasm/Archive.zig | 5 |
2 files changed, 4 insertions, 4 deletions
diff --git a/src/link/Wasm.zig b/src/link/Wasm.zig index 48ac09c8e7..4dd52aac8d 100644 --- a/src/link/Wasm.zig +++ b/src/link/Wasm.zig @@ -2462,8 +2462,7 @@ fn parseArchive(wasm: *Wasm, obj: link.Input.Object) !void { try wasm.objects.ensureUnusedCapacity(gpa, offsets.count()); for (offsets.keys()) |file_offset| { - const contents = file_contents[file_offset..]; - const object = try archive.parseObject(wasm, contents, obj.path, wasm.object_host_name, &ss, obj.must_link, gc_sections); + const object = try archive.parseObject(wasm, file_contents, file_offset, obj.path, wasm.object_host_name, &ss, obj.must_link, gc_sections); wasm.objects.appendAssumeCapacity(object); } } diff --git a/src/link/Wasm/Archive.zig b/src/link/Wasm/Archive.zig index 8cb494d305..3ecdedce8a 100644 --- a/src/link/Wasm/Archive.zig +++ b/src/link/Wasm/Archive.zig @@ -146,13 +146,14 @@ pub fn parseObject( archive: Archive, wasm: *Wasm, file_contents: []const u8, + object_offset: u32, path: Path, host_name: Wasm.OptionalString, scratch_space: *Object.ScratchSpace, must_link: bool, gc_sections: bool, ) !Object { - const header = mem.bytesAsValue(Header, file_contents[0..@sizeOf(Header)]); + const header = mem.bytesAsValue(Header, file_contents[object_offset..][0..@sizeOf(Header)]); if (!mem.eql(u8, &header.fmag, ARFMAG)) return error.BadHeaderDelimiter; const name_or_index = try header.nameOrIndex(); @@ -166,7 +167,7 @@ pub fn parseObject( }; const object_file_size = try header.parsedSize(); - const contents = file_contents[@sizeOf(Header)..][0..object_file_size]; + const contents = file_contents[object_offset + @sizeOf(Header) ..][0..object_file_size]; return Object.parse(wasm, contents, path, object_name, host_name, scratch_space, must_link, gc_sections); } |