authorgravatar for kubkon@jakubkonka.comJakub Konka <kubkon@jakubkonka.com> 2023-12-05 14:11:45+01:00
committergravatar for kubkon@jakubkonka.comJakub Konka <kubkon@jakubkonka.com> 2023-12-05 14:11:45+01:00
logb294103c7ed9892c54800b00d054619177d35839
tree3bb3ee188d289ad0bedf4ab18dd61ff625f791ab
parent52959bba7cdfc763c192d4a713b810fda80ccd02

elf: report malformed archive when parsing errors

2 files changed, 10 insertions(+), 12 deletions(-)

src/link/Elf.zig+6-6
......@@ -1042,7 +1042,7 @@ pub fn flushModule(self: *Elf, comp: *Compilation, prog_node: *std.Progress.Node
10421042
10431043 for (positionals.items) |obj| {
10441044 self.parsePositional(obj.path, obj.must_link) catch |err| switch (err) {
1045 error.MalformedObject, error.InvalidCpuArch => {}, // already reported
1045 error.MalformedObject, error.MalformedArchive, error.InvalidCpuArch => {}, // already reported
10461046 else => |e| try self.reportParseError(
10471047 obj.path,
10481048 "unexpected error: parsing input file failed with error {s}",
......@@ -1128,7 +1128,7 @@ pub fn flushModule(self: *Elf, comp: *Compilation, prog_node: *std.Progress.Node
11281128
11291129 for (system_libs.items) |lib| {
11301130 self.parseLibrary(lib, false) catch |err| switch (err) {
1131 error.MalformedObject, error.InvalidCpuArch => {}, // already reported
1131 error.MalformedObject, error.MalformedArchive, error.InvalidCpuArch => {}, // already reported
11321132 else => |e| try self.reportParseError(
11331133 lib.path,
11341134 "unexpected error: parsing library failed with error {s}",
......@@ -1151,7 +1151,7 @@ pub fn flushModule(self: *Elf, comp: *Compilation, prog_node: *std.Progress.Node
11511151
11521152 for (positionals.items) |obj| {
11531153 self.parsePositional(obj.path, obj.must_link) catch |err| switch (err) {
1154 error.MalformedObject, error.InvalidCpuArch => {}, // already reported
1154 error.MalformedObject, error.MalformedArchive, error.InvalidCpuArch => {}, // already reported
11551155 else => |e| try self.reportParseError(
11561156 obj.path,
11571157 "unexpected error: parsing input file failed with error {s}",
......@@ -1316,7 +1316,7 @@ pub fn flushStaticLib(self: *Elf, comp: *Compilation, module_obj_path: ?[]const
13161316
13171317 for (positionals.items) |obj| {
13181318 self.parsePositional(obj.path, obj.must_link) catch |err| switch (err) {
1319 error.MalformedObject, error.InvalidCpuArch => {}, // already reported
1319 error.MalformedObject, error.MalformedArchive, error.InvalidCpuArch => {}, // already reported
13201320 else => |e| try self.reportParseError(
13211321 obj.path,
13221322 "unexpected error: parsing input file failed with error {s}",
......@@ -1453,7 +1453,7 @@ pub fn flushObject(self: *Elf, comp: *Compilation, module_obj_path: ?[]const u8)
14531453
14541454 for (positionals.items) |obj| {
14551455 self.parsePositional(obj.path, obj.must_link) catch |err| switch (err) {
1456 error.MalformedObject, error.InvalidCpuArch => {}, // already reported
1456 error.MalformedObject, error.MalformedArchive, error.InvalidCpuArch => {}, // already reported
14571457 else => |e| try self.reportParseError(
14581458 obj.path,
14591459 "unexpected error: parsing input file failed with error {s}",
......@@ -1959,7 +1959,7 @@ fn parseLdScript(self: *Elf, lib: SystemLib) ParseError!void {
19591959 .needed = scr_obj.needed,
19601960 .path = full_path,
19611961 }, false) catch |err| switch (err) {
1962 error.MalformedObject, error.InvalidCpuArch => {}, // already reported
1962 error.MalformedObject, error.MalformedArchive, error.InvalidCpuArch => {}, // already reported
19631963 else => |e| try self.reportParseError(
19641964 full_path,
19651965 "unexpected error: parsing library failed with error {s}",
src/link/Elf/Archive.zig+4-6
......@@ -33,12 +33,10 @@ pub fn parse(self: *Archive, elf_file: *Elf) !void {
3333 const hdr = try reader.readStruct(elf.ar_hdr);
3434
3535 if (!mem.eql(u8, &hdr.ar_fmag, elf.ARFMAG)) {
36 // TODO convert into an error
37 log.debug(
38 "{s}: invalid header delimiter: expected '{s}', found '{s}'",
39 .{ self.path, std.fmt.fmtSliceEscapeLower(elf.ARFMAG), std.fmt.fmtSliceEscapeLower(&hdr.ar_fmag) },
40 );
41 return;
36 try elf_file.reportParseError(self.path, "invalid archive header delimiter: {s}", .{
37 std.fmt.fmtSliceEscapeLower(&hdr.ar_fmag),
38 });
39 return error.MalformedArchive;
4240 }
4341
4442 const size = try hdr.size();