From 95c68ae1e7caefb92af169fd675cdaec5e824d25 Mon Sep 17 00:00:00 2001
From: "Unknown W. Brackets" <checkins@unknownbrackets.org>
Date: Sat, 26 Oct 2013 18:30:55 -0700
Subject: [PATCH] Assert some unlikely buffer overflows.

---
 Core/HLE/sceKernelThread.cpp  | 4 ++--
 Core/MIPS/x86/RegCache.cpp    | 2 +-
 Core/MIPS/x86/RegCacheFPU.cpp | 8 ++++----
 3 files changed, 7 insertions(+), 7 deletions(-)

diff --git a/Core/HLE/sceKernelThread.cpp b/Core/HLE/sceKernelThread.cpp
index 408ce789d3..cf57bbc6c0 100644
--- a/Core/HLE/sceKernelThread.cpp
+++ b/Core/HLE/sceKernelThread.cpp
@@ -1580,7 +1580,7 @@ u32 sceKernelGetThreadmanIdList(u32 type, u32 readBufPtr, u32 readBufSize, u32 i
 void __KernelSaveContext(ThreadContext *ctx, bool vfpuEnabled)
 {
 	// r and f are immediately next to each other and must be.
-	memcpy(ctx->r, currentMIPS->r, sizeof(ctx->r) + sizeof(ctx->f));
+	memcpy((void *)ctx->r, (void *)currentMIPS->r, sizeof(ctx->r) + sizeof(ctx->f));
 
 	if (vfpuEnabled)
 	{
@@ -1595,7 +1595,7 @@ void __KernelSaveContext(ThreadContext *ctx, bool vfpuEnabled)
 void __KernelLoadContext(ThreadContext *ctx, bool vfpuEnabled)
 {
 	// r and f are immediately next to each other and must be.
-	memcpy(currentMIPS->r, ctx->r, sizeof(ctx->r) + sizeof(ctx->f));
+	memcpy((void *)currentMIPS->r, (void *)ctx->r, sizeof(ctx->r) + sizeof(ctx->f));
 
 	if (vfpuEnabled)
 	{
diff --git a/Core/MIPS/x86/RegCache.cpp b/Core/MIPS/x86/RegCache.cpp
index 1748e6a57c..94bbf3a481 100644
--- a/Core/MIPS/x86/RegCache.cpp
+++ b/Core/MIPS/x86/RegCache.cpp
@@ -146,7 +146,7 @@ void GPRRegCache::FlushR(X64Reg reg)
 {
 	if (reg >= NUM_X_REGS)
 		PanicAlert("Flushing non existent reg");
-	if (!xregs[reg].free)
+	else if (!xregs[reg].free)
 		StoreFromRegister(xregs[reg].mipsReg);
 }
 
diff --git a/Core/MIPS/x86/RegCacheFPU.cpp b/Core/MIPS/x86/RegCacheFPU.cpp
index 35f0d8d6f5..7fdad8fbe9 100644
--- a/Core/MIPS/x86/RegCacheFPU.cpp
+++ b/Core/MIPS/x86/RegCacheFPU.cpp
@@ -114,7 +114,7 @@ void FPURegCache::BindToRegister(const int i, bool doLoad, bool makeDirty) {
 	if (!regs[i].away) {
 		// Reg is at home in the memory register file. Let's pull it out.
 		X64Reg xr = GetFreeXReg();
-		_assert_msg_(JIT, xr < NUM_X_FPREGS, "WTF - load - invalid reg");
+		_assert_msg_(JIT, xr >= 0 && xr < NUM_X_FPREGS, "WTF - load - invalid reg");
 		xregs[xr].mipsReg = i;
 		xregs[xr].dirty = makeDirty;
 		OpArg newloc = ::Gen::R(xr);
@@ -137,7 +137,7 @@ void FPURegCache::StoreFromRegister(int i) {
 	_assert_msg_(JIT, !regs[i].location.IsImm(), "WTF - store - imm");
 	if (regs[i].away) {
 		X64Reg xr = regs[i].location.GetSimpleReg();
-		_assert_msg_(JIT, xr < NUM_X_FPREGS, "WTF - store - invalid reg");
+		_assert_msg_(JIT, xr >= 0 && xr < NUM_X_FPREGS, "WTF - store - invalid reg");
 		xregs[xr].dirty = false;
 		xregs[xr].mipsReg = -1;
 		OpArg newLoc = GetDefaultLocation(i);
@@ -153,7 +153,7 @@ void FPURegCache::DiscardR(int i) {
 	_assert_msg_(JIT, !regs[i].location.IsImm(), "FPU can't handle imm yet.");
 	if (regs[i].away) {
 		X64Reg xr = regs[i].location.GetSimpleReg();
-		_assert_msg_(JIT, xr < NUM_X_FPREGS, "DiscardR: MipsReg had bad X64Reg");
+		_assert_msg_(JIT, xr >= 0 && xr < NUM_X_FPREGS, "DiscardR: MipsReg had bad X64Reg");
 		// Note that we DO NOT write it back here. That's the whole point of Discard.
 		xregs[xr].dirty = false;
 		xregs[xr].mipsReg = -1;
@@ -266,7 +266,7 @@ X64Reg FPURegCache::GetFreeXReg() {
 void FPURegCache::FlushX(X64Reg reg) {
 	if (reg >= NUM_X_FPREGS)
 		PanicAlert("Flushing non existent reg");
-	if (xregs[reg].mipsReg != -1) {
+	else if (xregs[reg].mipsReg != -1) {
 		StoreFromRegister(xregs[reg].mipsReg);
 	}
 }