Merge pull request #86 from njsmith/master

edolstra · edolstra · commit 927b33223148 · 2016-04-28T11:10:48.000+02:00
Fix bug in walking .gnu.version_r linked list
diff --git a/src/patchelf.cc b/src/patchelf.cc
@@ -1337,7 +1337,7 @@ void ElfFile<ElfFileParamNames>::replaceNeeded(map<string, string>& libs)
                 debug("keeping .gnu.version_r entry `%s'\n", file);
             }
             // the Elf_Verneed structures form a linked list, so jump to next entry
-            need = (Elf_Verneed *) (contents + rdi(shdrVersionR.sh_offset) + rdi(need->vn_next));
+            need = (Elf_Verneed *) (((char *) need) + rdi(need->vn_next));
             --verNeedNum;
         }
     }

Original file line number	Diff line number	Diff line change
`@@ -1337,7 +1337,7 @@ void ElfFile<ElfFileParamNames>::replaceNeeded(map<string, string>& libs)`
`1337`	`1337`	debug("keeping .gnu.version_r entry `%s'\n", file);
`1338`	`1338`	`}`
`1339`	`1339`	`// the Elf_Verneed structures form a linked list, so jump to next entry`
`1340`		`- need = (Elf_Verneed *) (contents + rdi(shdrVersionR.sh_offset) + rdi(need->vn_next));`
	`1340`	`+ need = (Elf_Verneed ) (((char ) need) + rdi(need->vn_next));`
`1341`	`1341`	`--verNeedNum;`
`1342`	`1342`	`}`
`1343`	`1343`	`}`