Merge pull request #2701 from mickdermack/pr-jitnull

Prevent nullptr dereference on a crash with no JIT present
dolphin-emu · Jul 5, 2015 · 009148d · 009148d
2 parents f03f9cc + 2b2af12
commit 009148d
Showing 1 changed file with 6 additions and 0 deletions.
diff --git a/Source/Core/Core/PowerPC/JitInterface.cpp b/Source/Core/Core/PowerPC/JitInterface.cpp
@@ -203,6 +203,12 @@ namespace JitInterface
 
 	bool HandleFault(uintptr_t access_address, SContext* ctx)
 	{
+		// Prevent nullptr dereference on a crash with no JIT present
+		if (!jit)
+		{
+			return false;
+		}
+
 		return jit->HandleFault(access_address, ctx);
 	}