The-Homebrew-Cloud/Cemu
2
0
Fork 0
mirror of https://github.com/cemu-project/Cemu.git synced 2024-11-22 09:09:18 +01:00
Code Issues Packages Projects Releases Wiki Activity

proc_ui: Fix crash due to incorrect version handling

Browse Source 
Resolves a crash in NEX Remix
This commit is contained in:
Exzap 2024-05-04 08:05:10 +02:00
parent a16c37f0c5
commit 91a010fbdd
2 changed files with 4 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
src/Cafe/OS/libs/proc_ui/proc_ui.cpp
View File

@ -391,6 +391,9 @@ namespace proc_ui
{ {
cemuLog_log(LogType::Force, "ProcUI: Trying to register callback before init"); cemuLog_log(LogType::Force, "ProcUI: Trying to register callback before init");
cemu_assert_suspicious(); cemu_assert_suspicious();
// this shouldn't happen but lets set the memory pointers anyway to prevent a crash in case the user has incorrect meta info
s_memAllocPtr = gCoreinitData->MEMAllocFromDefaultHeap.GetMPTR();
s_memFreePtr = gCoreinitData->MEMFreeToDefaultHeap.GetMPTR();
} }
ProcUIInternalCallbackEntry* entry = (ProcUIInternalCallbackEntry*)_AllocMem(sizeof(ProcUIInternalCallbackEntry)); ProcUIInternalCallbackEntry* entry = (ProcUIInternalCallbackEntry*)_AllocMem(sizeof(ProcUIInternalCallbackEntry));
entry->funcPtr = funcPtr; entry->funcPtr = funcPtr;

2
src/Cafe/TitleList/TitleInfo.cpp
View File

@ -563,7 +563,7 @@ bool TitleInfo::ParseAppXml(std::vector<uint8>& appXmlData)
else if (name == "group_id") else if (name == "group_id")
m_parsedAppXml->group_id = (uint32)std::stoull(child.text().as_string(), nullptr, 16); m_parsedAppXml->group_id = (uint32)std::stoull(child.text().as_string(), nullptr, 16);
else if (name == "sdk_version") else if (name == "sdk_version")
m_parsedAppXml->sdk_version = (uint32)std::stoull(child.text().as_string(), nullptr, 16); m_parsedAppXml->sdk_version = (uint32)std::stoull(child.text().as_string(), nullptr, 10);
} }
return true; return true;
} }