izzy/ppsspp
0
0
Fork 0
mirror of https://github.com/izzy2lost/ppsspp.git synced 2026-03-10 12:43:04 -07:00
Code Issues Packages Projects Releases Wiki Activity

Clean up some different clamping.

Browse Source 
Could be cleaned up more but at least this is less weird.
This commit is contained in:
Unknown W. Brackets
2015-01-09 15:59:39 -08:00
parent 52288f5905
commit 1cefac6473
1 changed files with 2 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
Core/FileSystems/ISOFileSystem.cpp
View File

@@ -554,8 +554,7 @@ size_t ISOFileSystem::ReadFile(u32 handle, u8 *pointer, s64 size, int &usec)
{
positionOnIso = e.sectorStart * 2048 + e.seekPos;
if (e.seekPos + size > e.openSize)
{
if ((s64)e.seekPos + size > (s64)e.openSize) {
size = e.openSize - e.seekPos;
}
}
@@ -564,8 +563,7 @@ size_t ISOFileSystem::ReadFile(u32 handle, u8 *pointer, s64 size, int &usec)
_dbg_assert_msg_(FILESYS, e.file != 0, "Expecting non-raw fd to have a tree entry.");
//clamp read length
if ((s64)e.seekPos > e.file->size - (s64)size)
{
if ((s64)e.seekPos + size > e.file->size) {
size = e.file->size - (s64)e.seekPos;
}