Fix some more possible errors

Shadowed var n in MIPSIntVFPU

Possible buffer overflow in vertexdecoder.h

fix valid address checking in sceRtc function
This commit is contained in:
TMaul 2012-12-23 20:51:05 +00:00
parent b45c9a2747
commit e8f240c1d4
4 changed files with 6 additions and 5 deletions

View File

@ -541,7 +541,7 @@ int sceRtcGetWin32FileTime(u32 datePtr, u32 win32TimePtr)
int sceRtcCompareTick(u32 tick1Ptr, u32 tick2Ptr)
{
ERROR_LOG(HLE, "HACK sceRtcCompareTick(%d,%d)", tick1Ptr, tick2Ptr);
if (Memory::IsValidAddress(tick1Ptr)&&Memory::IsValidAddress(tick1Ptr))
if (Memory::IsValidAddress(tick1Ptr) && Memory::IsValidAddress(tick2Ptr))
{
u64 tick1 = Memory::Read_U64(tick1Ptr);
u64 tick2 = Memory::Read_U64(tick2Ptr);

View File

@ -26,6 +26,7 @@ class PMixer
{
public:
PMixer() {}
virtual ~PMixer() {}
virtual int Mix(short *stereoout, int numSamples) {memset(stereoout,0,numSamples*2*sizeof(short)); return numSamples;}
};

View File

@ -1452,7 +1452,7 @@ namespace MIPSInt
int vd = _VD;
int cond = op&15;
VectorSize sz = GetVecSize(op);
int n = GetNumVectorElements(sz);
int numElements = GetNumVectorElements(sz);
float s[4];
float t[4];
float d[4];
@ -1510,7 +1510,7 @@ namespace MIPSInt
int vd = _VD;
int cond = op&15;
VectorSize sz = GetVecSize(op);
int n = GetNumVectorElements(sz);
int numElements = GetNumVectorElements(sz);
float s[4];
float t[4];
float d[4];
@ -1535,7 +1535,7 @@ namespace MIPSInt
int vd = _VD;
int cond = op&15;
VectorSize sz = GetVecSize(op);
int n = GetNumVectorElements(sz);
int numElements = GetNumVectorElements(sz);
float s[4];
float t[4];
float d[4];

View File

@ -261,7 +261,7 @@ public:
}
break;
case DEC_FLOAT_4:
memcpy(color, data_ + decFmt_.c1off, 16); break;
memcpy(color, data_ + decFmt_.c1off, 3); break;
default:
ERROR_LOG(G3D, "Reader: Unsupported C1 Format");
break;