NixOS/patchelf
1
0
Fork 0
mirror of https://github.com/NixOS/patchelf.git synced 2025-10-21 23:10:49 +08:00
Code Issues Packages Projects Releases Wiki Activity

* When reordering the section headers, the e_shstrndx field in the ELF

Browse Source 
header should be updated as well.
This commit is contained in:
Eelco Dolstra
2008-05-28 11:53:16 +00:00
parent 1f713dd568
commit 36f96d03db
1 changed files with 7 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
src/patchelf.cc
View File

@@ -307,6 +307,9 @@ void ElfFile<ElfFileParamNames>::sortShdrs()
(rdi(shdrs[i].sh_type) == SHT_REL || rdi(shdrs[i].sh_type) == SHT_RELA)) (rdi(shdrs[i].sh_type) == SHT_REL || rdi(shdrs[i].sh_type) == SHT_RELA))
info[getSectionName(shdrs[i])] = getSectionName(shdrs[rdi(shdrs[i].sh_info)]); info[getSectionName(shdrs[i])] = getSectionName(shdrs[rdi(shdrs[i].sh_info)]);
/* Idem for the index of the .shstrtab section in the ELF header. */
SectionName shstrtabName = getSectionName(shdrs[rdi(hdr->e_shstrndx)]);
/* Sort the sections by offset. */ /* Sort the sections by offset. */
CompShdr comp; CompShdr comp;
comp.elfFile = this; comp.elfFile = this;
@@ -324,6 +327,9 @@ void ElfFile<ElfFileParamNames>::sortShdrs()
(rdi(shdrs[i].sh_type) == SHT_REL || rdi(shdrs[i].sh_type) == SHT_RELA)) (rdi(shdrs[i].sh_type) == SHT_REL || rdi(shdrs[i].sh_type) == SHT_RELA))
wri(shdrs[i].sh_info, wri(shdrs[i].sh_info,
findSection3(info[getSectionName(shdrs[i])])); findSection3(info[getSectionName(shdrs[i])]));
/* And the .shstrtab index. */
wri(hdr->e_shstrndx, findSection3(shstrtabName));
} }
@@ -579,7 +585,7 @@ void ElfFile<ElfFileParamNames>::rewriteSections()
/* Rewrite the section header table. For neatness, keep the /* Rewrite the section header table. For neatness, keep the
sections sorted. */ sections sorted. */
assert(rdi(hdr->e_shnum) == shdrs.size()); assert(rdi(hdr->e_shnum) == shdrs.size());
//sortShdrs(); !!! breaks the library sortShdrs();
for (unsigned int i = 1; i < rdi(hdr->e_shnum); ++i) for (unsigned int i = 1; i < rdi(hdr->e_shnum); ++i)
* ((Elf_Shdr *) (contents + rdi(hdr->e_shoff)) + i) = shdrs[i]; * ((Elf_Shdr *) (contents + rdi(hdr->e_shoff)) + i) = shdrs[i];