Merge #473

473: Other switches might set changed as true. Use extraStrings size. #416 r=Mic92 a=brenoguim Co-authored-by: Breno Rodrigues Guimaraes <brenorg@gmail.com>
NixOS · Mar 7, 2023 · ea2fca7 · ea2fca7
2 parents 12c1fe7 + fcb8fb7
commit ea2fca7
Show file tree

Hide file tree

Showing 2 changed files with 7 additions and 1 deletion.
diff --git a/src/patchelf.cc b/src/patchelf.cc
@@ -2163,7 +2163,7 @@ void ElfFile<ElfFileParamNames>::renameDynamicSymbols(const std::unordered_map<s
         }
     }
 
-    if (changed)
+    if (!extraStrings.empty())
     {
         auto newStrTabSize = strTab.size() + extraStrings.size();
         auto& newSec = replaceSection(".dynstr", newStrTabSize);

diff --git a/tests/rename-dynamic-symbols.sh b/tests/rename-dynamic-symbols.sh
@@ -82,3 +82,9 @@ ${PATCHELF} --rename-dynamic-symbols ../map *
 
 echo "# Run the patched tool and libraries"
 env LD_BIND_NOW=1 LD_LIBRARY_PATH=${PWD} ./many-syms-main
+
+# Test that other switches still work when --rename-dynamic-symbols has no effect
+echo "SYMBOL_THAT_DOESNT_EXIST ANOTHER_NAME" > map
+${PATCHELF} --set-rpath changed_rpath --rename-dynamic-symbols map --output libnewrpath.so "$full_lib_name"
+[ "$(${PATCHELF} --print-rpath libnewrpath.so)" = changed_rpath ] || exit 1
+