nold/Atmosphere
1
0
Fork 0
mirror of https://github.com/Atmosphere-NX/Atmosphere synced 2024-12-23 04:41:12 +00:00
Code Issues Projects Releases Packages Wiki Activity

Enforce upper bound on application tid range

Browse source
This commit is contained in:
Michael Scire 2019-02-12 02:53:31 -08:00
parent 1d0efbf456
commit 6027ff243d
3 changed files with 5 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
stratosphere/ams_mitm/source/utils.cpp
View file

@ -368,7 +368,7 @@ Result Utils::SaveSdFileForAtmosphere(u64 title_id, const char *fn, void *data,
} }
bool Utils::IsHblTid(u64 tid) { bool Utils::IsHblTid(u64 tid) {
return (g_override_any_app && tid >= 0x0100000000010000ULL) || (!g_override_any_app && tid == g_override_hbl_tid); return (g_override_any_app && IsApplicationTid(tid)) || (!g_override_any_app && tid == g_override_hbl_tid);
} }
bool Utils::HasTitleFlag(u64 tid, const char *flag) { bool Utils::HasTitleFlag(u64 tid, const char *flag) {
@ -447,7 +447,7 @@ Result Utils::GetKeysDown(u64 *keys) {
} }
bool Utils::HasOverrideButton(u64 tid) { bool Utils::HasOverrideButton(u64 tid) {
if (tid < 0x0100000000010000ULL || !IsSdInitialized()) { if ((!IsApplicationTid(tid)) || (!IsSdInitialized())) {
/* Disable button override disable for non-applications. */ /* Disable button override disable for non-applications. */
return true; return true;
} }

2
stratosphere/libstratosphere

@ -1 +1 @@
Subproject commit fb12edcbbaa5ef7a08fbb44d4aa13f0f37136537 Subproject commit a2c74f8cd5311f8050bcc5ea7d07b1ba4b697558

3
stratosphere/loader/source/ldr_content_management.cpp
View file

@ -16,6 +16,7 @@
#include <cstring> #include <cstring>
#include <switch.h> #include <switch.h>
#include <stratosphere.hpp>
#include <strings.h> #include <strings.h>
#include <vector> #include <vector>
#include <algorithm> #include <algorithm>
@ -309,7 +310,7 @@ void ContentManagement::TryMountSdCard() {
} }
bool ContentManagement::ShouldReplaceWithHBL(u64 tid) { bool ContentManagement::ShouldReplaceWithHBL(u64 tid) {
return g_mounted_hbl_nsp && ((g_override_any_app && tid >= 0x0100000000010000) || (!g_override_any_app && tid == g_override_hbl_tid)); return g_mounted_hbl_nsp && ((g_override_any_app && IsApplicationTid(tid)) || (!g_override_any_app && tid == g_override_hbl_tid));
} }
bool ContentManagement::ShouldOverrideContents(u64 tid) { bool ContentManagement::ShouldOverrideContents(u64 tid) {