--set-soname: overwrite in place if it fits (NixOS#44)

hpc · Sep 27, 2018 · 9a441a1 · 9a441a1
1 parent 27ffe8a
commit 9a441a1
Showing 1 changed file with 9 additions and 0 deletions.
diff --git a/src/patchelf.cc b/src/patchelf.cc
@@ -1082,6 +1082,15 @@ void ElfFile<ElfFileParamNames>::modifySoname(sonameMode op, const std::string &
 
     debug("new SONAME is '%s'\n", newSoname.c_str());
 
+    /* If new SONAME fits in existing space, overwrite. This works around
+       issue #44. */
+    if (newSoname.size() <= sonameSize) {
+       debug("overwriting old SONAME with new...\n");
+       strcpy(soname, newSoname.c_str());
+       changed = true;
+       return;
+    }
+
     /* Grow the .dynstr section to make room for the new SONAME. */
     debug("SONAME is too long, resizing...\n");