In symbol tables, rewrite st_value for STT_SECTION entries

edolstra · edolstra · commit df6243f5558b · 2014-01-14T13:23:07.000+01:00
diff --git a/src/patchelf.cc b/src/patchelf.cc
@@ -846,6 +846,10 @@ void ElfFile<ElfFileParamNames>::rewriteHeaders(Elf_Addr phdrAddress)
                 unsigned int newIndex = findSection3(section); // inefficient
                 //debug("rewriting symbol %d: index = %d (%s) -> %d\n", entry, shndx, section.c_str(), newIndex);
                 wri(sym->st_shndx, newIndex);
+                /* Rewrite st_value.  FIXME: we should do this for all
+                   types, but most don't actually change. */
+                if (ELF32_ST_TYPE(rdi(sym->st_info)) == STT_SECTION)
+                    wri(sym->st_value, rdi(shdrs[newIndex].sh_addr));
             }
         }
     }

Original file line number	Diff line number	Diff line change
`@@ -846,6 +846,10 @@ void ElfFile<ElfFileParamNames>::rewriteHeaders(Elf_Addr phdrAddress)`
`846`	`846`	`unsigned int newIndex = findSection3(section); // inefficient`
`847`	`847`	`//debug("rewriting symbol %d: index = %d (%s) -> %d\n", entry, shndx, section.c_str(), newIndex);`
`848`	`848`	`wri(sym->st_shndx, newIndex);`
	`849`	`+ /* Rewrite st_value. FIXME: we should do this for all`
	`850`	`+ types, but most don't actually change. */`
	`851`	`+ if (ELF32_ST_TYPE(rdi(sym->st_info)) == STT_SECTION)`
	`852`	`+ wri(sym->st_value, rdi(shdrs[newIndex].sh_addr));`
`849`	`853`	`}`
`850`	`854`	`}`
`851`	`855`	`}`