From 1cefac647321cd3d1fca3cb3f3c75ab005eb7401 Mon Sep 17 00:00:00 2001
From: "Unknown W. Brackets" <checkins@unknownbrackets.org>
Date: Fri, 9 Jan 2015 15:59:39 -0800
Subject: [PATCH] Clean up some different clamping.

Could be cleaned up more but at least this is less weird.
---
 Core/FileSystems/ISOFileSystem.cpp | 6 ++----
 1 file changed, 2 insertions(+), 4 deletions(-)

diff --git a/Core/FileSystems/ISOFileSystem.cpp b/Core/FileSystems/ISOFileSystem.cpp
index 63e44b8e7b..4856e20f04 100644
--- a/Core/FileSystems/ISOFileSystem.cpp
+++ b/Core/FileSystems/ISOFileSystem.cpp
@@ -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;
 			}