OmniNX/Horizon-OC
2
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

ldr_process_creation.cpp: pull from upstream (1.3.0-pre)

Browse Source
This commit is contained in:
KazushiM
2022-03-24 14:32:24 +08:00
parent 406b2df944
commit 3daff1b712
1 changed files with 3 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
Source/Atmosphere/stratosphere/loader/source/ldr_process_creation.cpp
View File

@@ -569,7 +569,7 @@ namespace ams::ldr {
/* Check hash if necessary. */ /* Check hash if necessary. */
if (check_hash) { if (check_hash) {
u8 hash[crypto::Sha256Generator::HashSize]; u8 hash[crypto::Sha256Generator::HashSize];
crypto::GenerateSha256Hash(hash, sizeof(hash), reinterpret_cast<void *>(map_base), segment->size); crypto::GenerateSha256(hash, sizeof(hash), reinterpret_cast<void *>(map_base), segment->size);
R_UNLESS(std::memcmp(hash, file_hash, sizeof(hash)) == 0, ldr::ResultInvalidNso()); R_UNLESS(std::memcmp(hash, file_hash, sizeof(hash)) == 0, ldr::ResultInvalidNso());
} }
@@ -698,13 +698,10 @@ namespace ams::ldr {
/* Load NSOs into process memory. */ /* Load NSOs into process memory. */
{ {
/* Ensure we close the process handle, if we fail. */ /* Ensure we close the process handle, if we fail. */
auto process_guard = SCOPE_GUARD { os::CloseNativeHandle(info.process_handle); }; ON_RESULT_FAILURE { os::CloseNativeHandle(info.process_handle); };
/* Load all NSOs. */ /* Load all NSOs. */
R_TRY(LoadAutoLoadModules(std::addressof(info), g_nso_headers, g_has_nso, argument)); R_TRY(LoadAutoLoadModules(std::addressof(info), g_nso_headers, g_has_nso, argument));
/* We don't need to close the process handle, since we succeeded. */
process_guard.Cancel();
} }
/* Register NSOs with the RoManager. */ /* Register NSOs with the RoManager. */
@@ -739,7 +736,7 @@ namespace ams::ldr {
/* Move the process handle to output. */ /* Move the process handle to output. */
*out = info.process_handle; *out = info.process_handle;
return ResultSuccess(); R_SUCCEED();
} }
Result GetProgramInfo(ProgramInfo *out, cfg::OverrideStatus *out_status, const ncm::ProgramLocation &loc, const char *path) { Result GetProgramInfo(ProgramInfo *out, cfg::OverrideStatus *out_status, const ncm::ProgramLocation &loc, const char *path) {