shifathosn
/
AnyPS5
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge pull request #5359 from thuanquang/fix/output-path-directory 

fix(relinker): reject a directory as the executable output path
This commit is contained in:
Dean 2026-10-14 14:36:09 +13:00 committed by GitHub
parent 3881dac903 286cf28ec7
commit e5a272d7a6
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
2 changed files with 23 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
core/relinker/main.cpp
View File

@ -91,6 +91,8 @@ int Run(const int argc, char* argv[]) {
if (std::filesystem::exists(Io::NativePath(args.inputPath)) && std::filesystem::exists(Io::NativePath(args.outputPath)) && std::filesystem::equivalent(Io::NativePath(args.inputPath), Io::NativePath(args.outputPath)))
throw Domain::RelinkerException("Executable output would overwrite the input executable");
if (Io::NativePath(args.outputPath).filename().empty() || std::filesystem::is_directory(Io::NativePath(args.outputPath)))
throw Domain::RelinkerException("Executable output is a directory: " + args.outputPath);
const std::string absPath = Io::Utf8Path(std::filesystem::absolute(Io::NativePath(args.outputPath)));
struct ExtraExecutable {

21
core/relinker/relinker/tests/test_input_preservation.py
View File

@ -142,6 +142,26 @@ def check_registry_after_failed_patch(relinker, work):
assert not (case / "app0").exists()
def check_output_directory(relinker, work):
for windows in (False, True):
for existing in (False, True):
case = work / f"output-directory-{windows}-{existing}"
(case / "sce_module").mkdir(parents=True)
(case / "sce_module" / "sample.prx").write_bytes(guest_fixture(PLAIN_SITE))
source = case / "input.elf"
source.write_bytes(main_fixture())
target = case / "output"
if existing:
target.mkdir()
output = str(target) if existing else str(target) + os.sep
options = ["--windows"] if windows else []
result = subprocess.run([str(relinker), *options, str(source), output], cwd=case,
capture_output=True, text=True, timeout=20)
assert result.returncode == 2 and "Executable output is a directory" in result.stderr, (result.stdout, result.stderr)
assert not (case / "app0").exists() and not (target / "app0").exists()
assert target.exists() == existing
def check_desktop_inputs(relinker, work):
for desktop in (False, True):
for bundled in (False, True):
@ -204,6 +224,7 @@ def main():
check_diagnostic_inputs(relinker, work)
check_desktop_inputs(relinker, work)
check_registry_after_failed_patch(relinker, work)
check_output_directory(relinker, work)
for windows in (False, True):
options = ["--windows"] if windows else []
check_registry_inputs(relinker, work, windows)