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

Merge pull request #6422 from sepalani/nullptr-blank 

HLE: Improve format string detection heuristic
This commit is contained in:
Léo Lam 2018-03-08 17:26:09 +01:00 committed by GitHub
parent d29667311e 4f1c0ca3e9
commit 1eae5fe790
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
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; std::string report_message;
// Is gpr3 pointing to a pointer rather than an ASCII string // 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)))) if (PowerPC::HostIsRAMAddress(GPR(3)) &&
(PowerPC::HostIsRAMAddress(PowerPC::HostRead_U32(GPR(3))) ||
PowerPC::HostRead_U32(GPR(3)) == 0))
{ {
if (PowerPC::HostIsRAMAddress(GPR(4))) if (PowerPC::HostIsRAMAddress(GPR(4)))
{ {