ShuriZma
/
dolphin
mirror of https://github.com/dolphin-emu/dolphin.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

HLE: Improve format string detection heuristic

This commit is contained in:
Sepalani 2018-03-06 21:21:56 +04:00
parent a436c6182b
commit 4f1c0ca3e9
1 changed files with 4 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
Source/Core/Core/HLE/HLE_OS.cpp
View File

@ -47,8 +47,10 @@ void HLE_GeneralDebugPrint(ParameterType parameter_type)
{
std::string report_message;
// Is gpr3 pointing to a pointer rather than an ASCII string
if (PowerPC::HostIsRAMAddress(GPR(3)) && PowerPC::HostIsRAMAddress(PowerPC::HostRead_U32(GPR(3))))
// Is gpr3 pointing to a pointer (including nullptr) rather than an ASCII string
if (PowerPC::HostIsRAMAddress(GPR(3)) &&
(PowerPC::HostIsRAMAddress(PowerPC::HostRead_U32(GPR(3))) ||
PowerPC::HostRead_U32(GPR(3)) == 0))
{
if (PowerPC::HostIsRAMAddress(GPR(4)))
{