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

Merge pull request #124 from lioncash/array-bounds 

sVU_zerorec.cpp: Correctly guard against invalid indexes in SuperVUDestroy
This commit is contained in:
sudonim1 2014-07-15 11:27:53 +01:00
parent 3f62ad08e1 a1080f4853
commit 86a0d3faff
1 changed files with 3 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
pcsx2/x86/sVU_zerorec.cpp
View File

@ -395,7 +395,7 @@ void DestroyVUHeaders(int vuindex)
// destroy VU resources // destroy VU resources
void SuperVUDestroy(int vuindex) void SuperVUDestroy(int vuindex)
{ {
pxAssertDev(vuindex >= 0 && vuindex <= 2, "Invalid VU index parameter!"); pxAssertDev(vuindex == 0 || vuindex == 1, "Invalid VU index parameter!");
safe_delete_array(recVUHeaders[vuindex]); safe_delete_array(recVUHeaders[vuindex]);
safe_delete_array(recVUBlocks[vuindex]); safe_delete_array(recVUBlocks[vuindex]);
@ -417,7 +417,7 @@ void SuperVUDestroy(int vuindex)
// reset VU // reset VU
void SuperVUReset(int vuindex) void SuperVUReset(int vuindex)
{ {
pxAssertDev(vuindex >= 0 && vuindex <= 2, "Invalid VU index parameter!"); pxAssertDev(vuindex == 0 || vuindex == 1, "Invalid VU index parameter!");
#ifdef PCSX2_DEBUG #ifdef PCSX2_DEBUG
s_vucount = 0; s_vucount = 0;
@ -816,7 +816,7 @@ void VuBaseBlock::GetInstsAtPc(int instpc, list<VuInstruction*>& listinsts)
static VuFunctionHeader* SuperVURecompileProgram(u32 startpc, int vuindex) static VuFunctionHeader* SuperVURecompileProgram(u32 startpc, int vuindex)
{ {
pxAssert(vuindex < 2); pxAssert(vuindex == 0 || vuindex == 1);
pxAssert(s_recVUPtr[vuindex] != NULL); pxAssert(s_recVUPtr[vuindex] != NULL);
//Console.WriteLn("svu%c rec: %x", '0'+vuindex, startpc); //Console.WriteLn("svu%c rec: %x", '0'+vuindex, startpc);