Merge pull request #202 from rpurdie/master

domenkozar · web-flow · commit 640a35faaa9e · 2020-06-03T16:01:03.000+02:00
Fix shared library corruption when rerunning patchelf
diff --git a/src/patchelf.cc b/src/patchelf.cc
@@ -752,6 +752,7 @@ void ElfFile<ElfFileParamNames>::rewriteSectionsLibrary()
     }
 
     /* Add a segment that maps the replaced sections into memory. */
+    wri(hdr->e_phoff, sizeof(Elf_Ehdr));
     phdrs.resize(rdi(hdr->e_phnum) + 1);
     wri(hdr->e_phnum, rdi(hdr->e_phnum) + 1);
     Elf_Phdr & phdr = phdrs[rdi(hdr->e_phnum) - 1];

Original file line number	Diff line number	Diff line change
`@@ -752,6 +752,7 @@ void ElfFile<ElfFileParamNames>::rewriteSectionsLibrary()`
`752`	`752`	`}`
`753`	`753`
`754`	`754`	`/* Add a segment that maps the replaced sections into memory. */`
	`755`	`+ wri(hdr->e_phoff, sizeof(Elf_Ehdr));`
`755`	`756`	`phdrs.resize(rdi(hdr->e_phnum) + 1);`
`756`	`757`	`wri(hdr->e_phnum, rdi(hdr->e_phnum) + 1);`
`757`	`758`	`Elf_Phdr & phdr = phdrs[rdi(hdr->e_phnum) - 1];`