all repos — mgba @ 1119d773e16d4183599bf3823fd3670b3e2e341d

mGBA Game Boy Advance Emulator

Util: Fix some warnings
Jeffrey Pfau jeffrey@endrift.com
Thu, 15 Jan 2015 00:13:41 -0800
commit

1119d773e16d4183599bf3823fd3670b3e2e341d

parent

543ffac706d5a832c8e02ba1f9362df76a1a1bf0

1 files changed, 6 insertions(+), 3 deletions(-)

jump to
M src/util/patch-ups.csrc/util/patch-ups.c

@@ -129,6 +129,9 @@ _decodeLength(patch->vf); // Discard input size

if (_decodeLength(patch->vf) != outSize) { return false; } + if (inSize > SSIZE_MAX || outSize > SSIZE_MAX) { + return false; + } size_t metadataLength = _decodeLength(patch->vf); patch->vf->seek(patch->vf, metadataLength, SEEK_CUR); // Skip metadata size_t writeLocation = 0;

@@ -153,7 +156,7 @@ writeLocation += length;

break; case 0x1: // TargetRead - if (patch->vf->read(patch->vf, &writeBuffer[writeLocation], length) != length) { + if (patch->vf->read(patch->vf, &writeBuffer[writeLocation], length) != (ssize_t) length) { return false; } outputChecksum = updateCrc32(outputChecksum, &writeBuffer[writeLocation], length);

@@ -167,7 +170,7 @@ readSourceLocation -= readOffset >> 1;

} else { readSourceLocation += readOffset >> 1; } - if (readSourceLocation < 0 || readSourceLocation > inSize) { + if (readSourceLocation < 0 || readSourceLocation > (ssize_t) inSize) { return false; } memmove(&writeBuffer[writeLocation], &readBuffer[readSourceLocation], length);

@@ -183,7 +186,7 @@ readTargetLocation -= readOffset >> 1;

} else { readTargetLocation += readOffset >> 1; } - if (readTargetLocation < 0 || readTargetLocation > outSize) { + if (readTargetLocation < 0 || readTargetLocation > (ssize_t) outSize) { return false; } for (i = 0; i < length; ++i) {