Merge pull request #86 from njsmith/master

Fix bug in walking .gnu.version_r linked list
NixOS · Apr 28, 2016 · 927b332 · 927b332
2 parents 77efcf2 + abae785
commit 927b332
Showing 1 changed file with 1 addition and 1 deletion.
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;
         }
     }