From cc2fabbf0ae5478abc97e65e138e8956e439fde3 Mon Sep 17 00:00:00 2001 From: Mystro256 Date: Sun, 12 Feb 2017 00:48:24 -0500 Subject: [PATCH] Use fread return values for apply patch error checking Silences gcc warnings --- src/common/Patch.cpp | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/src/common/Patch.cpp b/src/common/Patch.cpp index e055f716..03839f2e 100644 --- a/src/common/Patch.cpp +++ b/src/common/Patch.cpp @@ -356,8 +356,8 @@ static bool patchApplyPPF2(FILE* f, uint8_t** rom, int* size) uint8_t* mem = *rom; uint8_t block[1024]; - fread(&block, 1, 1024, f); - if (memcmp(&mem[0x9320], &block, 1024) != 0) + if (fread(&block, 1, 1024, f) == 0 || + memcmp(&mem[0x9320], &block, 1024) != 0) return false; int idlen = ppfFileIdLen(f, 2); @@ -402,8 +402,8 @@ static bool patchApplyPPF3(FILE* f, uint8_t** rom, int* size) if (blockcheck) { uint8_t block[1024]; - fread(&block, 1, 1024, f); - if (memcmp(&mem[(imagetype == 0) ? 0x9320 : 0x80A0], &block, 1024) != 0) + if (fread(&block, 1, 1024, f) == 0 || + memcmp(&mem[(imagetype == 0) ? 0x9320 : 0x80A0], &block, 1024) != 0) return false; count -= 1024; }