Merge pull request #4952 from ligfx/fix_10110

PatchEngine: check instruction at link addr is non-zero
dolphin-emu · Feb 24, 2017 · 1f04bab · 1f04bab
2 parents 25fc7ed + da35abb
commit 1f04bab
Showing 1 changed file with 2 additions and 1 deletion.
diff --git a/Source/Core/Core/PatchEngine.cpp b/Source/Core/Core/PatchEngine.cpp
@@ -223,7 +223,8 @@ static bool IsStackSane()
     return false;
 
   // Check the link register makes sense (that it points to a valid IBAT address)
-  return PowerPC::HostIsInstructionRAMAddress(PowerPC::HostRead_U32(next_SP + 4));
+  const u32 address = PowerPC::HostRead_U32(next_SP + 4);
+  return PowerPC::HostIsInstructionRAMAddress(address) && 0 != PowerPC::HostRead_U32(address);
 }
 
 bool ApplyFramePatches()