Skip to content

Fix bug where section header string table was not fixed up and could … #1

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 1 commit into from
Dec 13, 2018
Merged

Fix bug where section header string table was not fixed up and could … #1

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Binary file modified bin/dwarfexport.plx
View file
Open in desktop
Binary file not shown.
Binary file modified bin/dwarfexport.plx64
View file
Open in desktop
Binary file not shown.
20 changes: 18 additions & 2 deletions src/dwarfgen.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -348,13 +348,29 @@ static void generate_copy_with_dbg_info(std::shared_ptr<DwarfGenInfo> info,

add_debug_section_data(info);

// Fix the section header start location
// Get the current last section (to fix section header and string table loc)
auto last_scn = get_last_section(elf_out);
GElf_Shdr last_shdr;
if (gelf_getshdr(last_scn, &last_shdr) != &last_shdr)
dwarfexport_error("gelf_getshdr() failed: ", elf_errmsg(-1));

ehdr_out.e_shoff = last_shdr.sh_offset + last_shdr.sh_size;
// Fix the section header string table start location
std::size_t shstrndx = 0;
if (elf_getshdrstrndx(elf_out, &shstrndx) == -1)
dwarfexport_error("elf_getshdrstrndx() failed: ", elf_errmsg(-1));

Elf_Scn *shstr_scn = elf_getscn(elf_out, shstrndx);
GElf_Shdr shstr_shdr;
if (!gelf_getshdr(shstr_scn, &shstr_shdr))
dwarfexport_error("elf_getshdr() failed: ", elf_errmsg(-1));

shstr_shdr.sh_offset = last_shdr.sh_offset + last_shdr.sh_size;

if (!gelf_update_shdr(shstr_scn, &shstr_shdr))
dwarfexport_error("gelf_update_shdr() failed: ", elf_errmsg(-1));

// Fix the section header start location
ehdr_out.e_shoff = shstr_shdr.sh_offset + shstr_shdr.sh_size;
if (gelf_update_ehdr(elf_out, &ehdr_out) == 0)
dwarfexport_error("gelf_update_ehdr() failed: ", elf_errmsg(-1));

Expand Down