Skip to content

fix(libc): look in prx, sce_module and sce_modules for a relinked module after its own directory #10494

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
oneandonlydean merged 2 commits into from
Oct 26, 2026
Merged

fix(libc): look in prx, sce_module and sce_modules for a relinked module after its own directory #10494

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
c917d98
fix(libc): prefer nested prx/*.guest.prx for RelinkedModulePath
notaxeltv Oct 15, 2026
e2dda5e
fix(libc): prefer a same-directory relinked module over nested prx fo…
xXPBSXx Oct 23, 2026
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
8 changes: 7 additions & 1 deletion core/libs/prx/libc/src/General.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -742,9 +742,15 @@ extern "C" std::filesystem::path RelinkedModulePath_nid_no_patch(const std::file
const auto relinked = RelinkedModuleName(path);
std::error_code error;
if (std::filesystem::is_regular_file(relinked, error)) return relinked;
const auto parent = relinked.parent_path().empty() ? std::filesystem::path(".") : relinked.parent_path();
NameMatch names[] = {{relinked.filename().string()}, {path.filename().string(), std::nullopt, false, true}};
MatchNames(relinked.parent_path().empty() ? "." : relinked.parent_path(), names);
MatchNames(parent, names);
if (names[0].ambiguous || names[0].path) return MatchedModuleOrPath(path, relinked, names[0]);
for (const char* directory : {"prx", "sce_module", "sce_modules"}) {
NameMatch nested[] = {{relinked.filename().string()}};
MatchNames(parent / directory, nested);
if (nested[0].ambiguous || nested[0].path) return MatchedModuleOrPath(path, relinked, nested[0]);
}
return names[1].path ? *names[1].path : path;
}

Expand Down
48 changes: 48 additions & 0 deletions core/libs/tests/GuestDynamicLoader.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -218,6 +218,54 @@ int main(int argc, char** argv) {
std::error_code notEmpty;
if (createdLibs) std::filesystem::remove("libs", notEmpty);

const std::filesystem::path nestedRoot = "anyps5-relinked-prx-dir-for-test";
const std::filesystem::path nestedGuest = nestedRoot / "Engine.Render.prx";
const std::filesystem::path nestedRelinked = nestedRoot / "prx" / "Engine.Render.prx.guest.prx";
std::filesystem::create_directories(nestedRelinked.parent_path());
{
std::ofstream elf(nestedGuest, std::ios::binary);
elf.write("\x7f" "ELF", 4);
}
std::filesystem::copy_file(argv[1], nestedRelinked, std::filesystem::copy_options::overwrite_existing);
void* nested = dlopen_nid_postfix(nestedGuest.string().c_str(), 2);
Require(nested != nullptr);
add = reinterpret_cast<Add>(dlsym_nid_postfix(nested, "GuestModuleAdd"));
Require(add && add(20, 22) == 42);
Require(dlclose_nid_postfix(nested) == 0);
std::filesystem::remove_all(nestedRoot);

const std::filesystem::path layeredRoot = "anyps5-relinked-prx-layers-for-test";
const std::filesystem::path layeredGuest = layeredRoot / "Engine.Layers.prx";
std::filesystem::create_directories(layeredRoot / "prx");
{
std::ofstream elf(layeredGuest, std::ios::binary);
elf.write("" "ELF", 4);
std::ofstream broken(layeredRoot / "prx" / "Engine.Layers.prx.guest.prx", std::ios::binary);
broken << "not a module";
}
std::filesystem::copy_file(argv[1], layeredRoot / "ENGINE.LAYERS.PRX.GUEST.PRX", std::filesystem::copy_options::overwrite_existing);
void* layered = dlopen_nid_postfix(layeredGuest.string().c_str(), 2);
Require(layered != nullptr);
add = reinterpret_cast<Add>(dlsym_nid_postfix(layered, "GuestModuleAdd"));
Require(add && add(19, 23) == 42);
Require(dlclose_nid_postfix(layered) == 0);
std::filesystem::remove_all(layeredRoot);

const std::filesystem::path foldedRoot = "anyps5-relinked-prx-folded-for-test";
const std::filesystem::path foldedGuest = foldedRoot / "Engine.Folded.prx";
std::filesystem::create_directories(foldedRoot / "prx");
{
std::ofstream elf(foldedGuest, std::ios::binary);
elf.write("" "ELF", 4);
}
std::filesystem::copy_file(argv[1], foldedRoot / "prx" / "ENGINE.FOLDED.PRX.GUEST.PRX", std::filesystem::copy_options::overwrite_existing);
void* folded = dlopen_nid_postfix(foldedGuest.string().c_str(), 2);
Require(folded != nullptr);
add = reinterpret_cast<Add>(dlsym_nid_postfix(folded, "GuestModuleAdd"));
Require(add && add(10, 32) == 42);
Require(dlclose_nid_postfix(folded) == 0);
std::filesystem::remove_all(foldedRoot);

void* pinned = dlopen_nid_postfix(argv[1], 2);
add = reinterpret_cast<Add>(dlsym_nid_postfix(pinned, "GuestModuleAdd"));
Require(add && _sceKernelRtldThreadAtexitIncrement_nid_postfix(reinterpret_cast<const void*>(add)) == 0);
Expand Down
Loading