summaryrefslogtreecommitdiff
path: root/macosx/Source/PcsxrMemCardArray.m
diff options
context:
space:
mode:
authorSND\MaddTheSane_cp <SND\MaddTheSane_cp@e17a0e51-4ae3-4d35-97c3-1a29b211df97>2015-02-07 22:17:23 +0000
committerSND\MaddTheSane_cp <SND\MaddTheSane_cp@e17a0e51-4ae3-4d35-97c3-1a29b211df97>2015-02-07 22:17:23 +0000
commit527da3c3bb8e367c731b7fe437f1283b2a549912 (patch)
tree583659074747347b56f6bb3cbe07228e72b19c43 /macosx/Source/PcsxrMemCardArray.m
parent1b1d4c3f6a72dfe050ef652694f98a86ff8c7ea4 (diff)
downloadpcsxr-527da3c3bb8e367c731b7fe437f1283b2a549912.tar.gz
OS X: Fix an off-by-one error that was causing the QuickLook and Spotlight plug-ins to crash.
The bug was also present in the app itself, but it didn't crash. git-svn-id: https://pcsxr.svn.codeplex.com/svn/pcsxr@93874 e17a0e51-4ae3-4d35-97c3-1a29b211df97
Diffstat (limited to 'macosx/Source/PcsxrMemCardArray.m')
-rw-r--r--macosx/Source/PcsxrMemCardArray.m4
1 files changed, 2 insertions, 2 deletions
diff --git a/macosx/Source/PcsxrMemCardArray.m b/macosx/Source/PcsxrMemCardArray.m
index ea739ffb..b7429f20 100644
--- a/macosx/Source/PcsxrMemCardArray.m
+++ b/macosx/Source/PcsxrMemCardArray.m
@@ -108,7 +108,7 @@ static inline void ClearMemcardData(char *to, int dsti, char *str)
i++;
continue;
}
- do {
+ while (i + x < MAX_MEMCARD_BLOCKS) {
McdBlock tmpBlock;
GetMcdBlockInfo(carNum, i + x + 1, &tmpBlock);
if ((tmpBlock.Flags & 0x3) == 0x3) {
@@ -119,7 +119,7 @@ static inline void ClearMemcardData(char *to, int dsti, char *str)
} else {
break;
}
- } while (i + x - 1 < MAX_MEMCARD_BLOCKS);
+ };
@autoreleasepool {
PcsxrMemoryObject *obj = [[PcsxrMemoryObject alloc] initWithMcdBlock:&memBlock startingIndex:i size:x];
[tmpMemArray addObject:obj];