zig

commit c2d37224c843feb84f4522ec35d192968b786e08 (tree)
parent 0e66df2094364cf5e09fa67561a038639dfe51e6
Author: Eckhart Köppen <eck@40hz.org>
Date:   Wed, 11 Jan 2023 15:36:54 +0200

zig objcopy: Fix corrupted hex output

Do not return stack local data for hex record payload data.

Diffstat:
M
src/objcopy.zig
 | 
12
+++++++++++-

1 file changed, 11 insertions(+), 1 deletion(-)
diff --git a/src/objcopy.zig b/src/objcopy.zig
@@ -432,7 +432,7 @@ const HexWriter = struct {
             }
         }
 
-        fn getPayloadBytes(self: Record) []const u8 {
+        fn getPayloadBytes(self: *const Record) []const u8 {
             return switch (self.payload) {
                 .Data => |d| d,
                 .EOF => @as([]const u8, &.{}),
@@ -518,6 +518,16 @@ fn padFile(f: File, opt_size: ?u64) !void {
     try f.setEndPos(size);
 }
 
+test "HexWriter.Record.Address has correct payload and checksum" {
+    const record = HexWriter.Record.Address(0x0800_0000);
+    const payload = record.getPayloadBytes();
+    const sum = record.checksum();
+    try std.testing.expect(sum == 0xF2);
+    try std.testing.expect(payload.len == 2);
+    try std.testing.expect(payload[0] == 8);
+    try std.testing.expect(payload[1] == 0);
+}
+
 test "containsValidAddressRange" {
     var segment = BinaryElfSegment{
         .physicalAddress = 0,