Mirrors/Citron
1
0
Fork 0
mirror of https://git.citron-emu.org/Citron/Citron.git synced 2025-02-02 06:16:27 +01:00
Code Issues Projects Releases Packages Wiki Activity Actions

service-am: Handle panic conditions in SetTerminateResult

Browse source 
- Prevents propagation of panic conditions when setting termination results
- Previously, panic error codes could trigger cascading crashes
- Only stores non-error termination results while allowing successful completion
- Fixes crash when applications set panic-related termination codes (0x1A80A)
This commit is contained in:
Zephyron 2025-01-20 16:06:08 +10:00
parent 6d225eb94a
commit b574aba98b
1 changed files with 6 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

9
src/core/hle/service/am/service/application_functions.cpp
View file

@ -181,13 +181,16 @@ Result IApplicationFunctions::GetDesiredLanguage(Out<u64> out_language_code) {
} }
Result IApplicationFunctions::SetTerminateResult(Result terminate_result) { Result IApplicationFunctions::SetTerminateResult(Result terminate_result) {
LOG_INFO(Service_AM, "(STUBBED) called, result={:#x} ({:04}-{:04})", LOG_INFO(Service_AM, "called, result={:#x} ({:04}-{:04})",
terminate_result.GetInnerValue(), terminate_result.GetInnerValue(),
static_cast<u32>(terminate_result.GetModule()) + 2000, static_cast<u32>(terminate_result.GetModule()) + 2000,
terminate_result.GetDescription()); terminate_result.GetDescription());
std::scoped_lock lk{m_applet->lock}; // Only set the terminate result if it's not a panic
m_applet->terminate_result = terminate_result; if (!terminate_result.IsError()) {
std::scoped_lock lk{m_applet->lock};
m_applet->terminate_result = terminate_result;
}
R_SUCCEED(); R_SUCCEED();
} }