0ct0pu5/ladybird
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions 2

LibELF: Always use parent object basename for $ORIGIN processing

Browse source 
Using the main executable basename produces the wrong $ORIGIN processing
for libraries that are secondary dependencies of the main executable,
or dependencies of an object loaded via dlopen.
This commit is contained in:
Andrew Kaster 2022-06-11 13:55:04 -06:00 • committed by Linus Groh
parent 64d48bcdc1
commit 72066880c6
Notes: sideshowbarker 2024-07-17 10:18:25 +09:00
1 changed files with 1 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
Userland/Libraries/LibELF/DynamicLinker.cpp
View file

@ -120,7 +120,7 @@ static Optional<String> resolve_library(String const& name, DynamicObject const&
search_paths.append("/usr/local/lib"sv);
for (auto const& search_path : search_paths) {
LexicalPath library_path(search_path.replace("$ORIGIN"sv, LexicalPath::dirname(s_main_program_name)));
LexicalPath library_path(search_path.replace("$ORIGIN"sv, LexicalPath::dirname(parent_object.filename())));
String library_name = library_path.append(name).string();
if (access(library_name.characters(), F_OK) == 0)