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

CDVD: Fix crash when trying to scan small gzip files

This commit is contained in:
Connor McLaughlin 2022-05-25 22:35:37 +10:00 committed by refractionpcsx2
parent 69f058e532
commit 628560850a
1 changed files with 1 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
pcsx2/CDVD/ChunksCache.h
View File

@ -17,8 +17,6 @@
#include "zlib_indexed.h"
#define CLAMP(val, minval, maxval) (std::min(maxval, std::max(minval, val)))
class ChunksCache
{
public:
@ -36,7 +34,7 @@ public:
static int CopyAvailable(void* pSrc, s64 srcOffset, int srcSize,
void* pDst, s64 dstOffset, int maxCopySize)
{
int available = CLAMP(maxCopySize, 0, (int)(srcOffset + srcSize - dstOffset));
int available = std::clamp(maxCopySize, 0, std::max((int)(srcOffset + srcSize - dstOffset), 0));
memcpy(pDst, (char*)pSrc + (dstOffset - srcOffset), available);
return available;
};
@ -68,5 +66,3 @@ private:
s64 m_size;
s64 m_limit;
};
#undef CLAMP