mirror/zig
1
0
Fork 0
mirror of https://github.com/ziglang/zig.git synced 2025-12-15 18:53:07 +00:00
Code Issues Packages Projects Releases Wiki Activity

Fix: std.elf offset computation

Browse Source
This commit is contained in:
Giuseppe Cesarano 2025-08-08 20:32:17 +02:00 committed by Andrew Kelley
parent 1ba6838bc3
commit 3ee4252183
1 changed files with 8 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
lib/std/elf.zig
View File

@ -584,7 +584,8 @@ pub const ProgramHeaderIterator = struct {
if (it.index >= it.elf_header.phnum) return null; if (it.index >= it.elf_header.phnum) return null;
defer it.index += 1; defer it.index += 1;
const offset = it.elf_header.phoff + if (it.elf_header.is_64) @sizeOf(Elf64_Phdr) else @sizeOf(Elf32_Phdr) * it.index; const size: u64 = if (it.elf_header.is_64) @sizeOf(Elf64_Phdr) else @sizeOf(Elf32_Phdr);
const offset = it.elf_header.phoff + size * it.index;
try it.file_reader.seekTo(offset); try it.file_reader.seekTo(offset);
return takePhdr(&it.file_reader.interface, it.elf_header); return takePhdr(&it.file_reader.interface, it.elf_header);
@ -600,7 +601,8 @@ pub const ProgramHeaderBufferIterator = struct {
if (it.index >= it.elf_header.phnum) return null; if (it.index >= it.elf_header.phnum) return null;
defer it.index += 1; defer it.index += 1;
const offset = it.elf_header.phoff + if (it.elf_header.is_64) @sizeOf(Elf64_Phdr) else @sizeOf(Elf32_Phdr) * it.index; const size: u64 = if (it.elf_header.is_64) @sizeOf(Elf64_Phdr) else @sizeOf(Elf32_Phdr);
const offset = it.elf_header.phoff + size * it.index;
var reader = std.Io.Reader.fixed(it.buf[offset..]); var reader = std.Io.Reader.fixed(it.buf[offset..]);
return takePhdr(&reader, it.elf_header); return takePhdr(&reader, it.elf_header);
@ -635,7 +637,8 @@ pub const SectionHeaderIterator = struct {
if (it.index >= it.elf_header.shnum) return null; if (it.index >= it.elf_header.shnum) return null;
defer it.index += 1; defer it.index += 1;
const offset = it.elf_header.shoff + if (it.elf_header.is_64) @sizeOf(Elf64_Shdr) else @sizeOf(Elf32_Shdr) * it.index; const size: u64 = if (it.elf_header.is_64) @sizeOf(Elf64_Shdr) else @sizeOf(Elf32_Shdr);
const offset = it.elf_header.shoff + size * it.index;
try it.file_reader.seekTo(offset); try it.file_reader.seekTo(offset);
return takeShdr(&it.file_reader.interface, it.elf_header); return takeShdr(&it.file_reader.interface, it.elf_header);
@ -651,7 +654,8 @@ pub const SectionHeaderBufferIterator = struct {
if (it.index >= it.elf_header.shnum) return null; if (it.index >= it.elf_header.shnum) return null;
defer it.index += 1; defer it.index += 1;
const offset = it.elf_header.shoff + if (it.elf_header.is_64) @sizeOf(Elf64_Shdr) else @sizeOf(Elf32_Shdr) * it.index; const size: u64 = if (it.elf_header.is_64) @sizeOf(Elf64_Shdr) else @sizeOf(Elf32_Shdr);
const offset = it.elf_header.shoff + size * it.index;
var reader = std.Io.Reader.fixed(it.buf[offset..]); var reader = std.Io.Reader.fixed(it.buf[offset..]);
return takeShdr(&reader, it.elf_header); return takeShdr(&reader, it.elf_header);