[Scummvm-git-logs] scummvm master -> 4221c38167065a00393dcf515bcb3c769f9a273c

[sev-]

This automated email contains information about 1 new commit which have been
pushed to the 'scummvm' repo located at https://github.com/scummvm/scummvm .

Summary:
4221c38167 COMMON: Support MacBinary3 files produced by ISOBuster


Commit: 4221c38167065a00393dcf515bcb3c769f9a273c
    https://github.com/scummvm/scummvm/commit/4221c38167065a00393dcf515bcb3c769f9a273c
Author: Eugene Sandulenko (sev at scummvm.org)
Date: 2020-08-01T20:25:39+02:00

Commit Message:
COMMON: Support MacBinary3 files produced by ISOBuster

Changed paths:
    common/macresman.cpp


diff --git a/common/macresman.cpp b/common/macresman.cpp
index c45495d22e..6e1deee0a0 100644
--- a/common/macresman.cpp
+++ b/common/macresman.cpp
@@ -424,10 +424,11 @@ bool MacResManager::loadFromMacBinary(SeekableReadStream &stream) {
 		uint32 rsrcSize = READ_BE_UINT32(infoHeader + MBI_RFLEN);
 
 		uint32 dataSizePad = (((dataSize + 127) >> 7) << 7);
-		uint32 rsrcSizePad = (((rsrcSize + 127) >> 7) << 7);
+		// Files produced by ISOBuster are not padded, thus, compare with the actual size
+		//uint32 rsrcSizePad = (((rsrcSize + 127) >> 7) << 7);
 
 		// Length check
-		if (MBI_INFOHDR + dataSizePad + rsrcSizePad == (uint32)stream.size()) {
+		if (MBI_INFOHDR + dataSizePad + rsrcSize <= (uint32)stream.size()) {
 			_resForkOffset = MBI_INFOHDR + dataSizePad;
 			_resForkSize = rsrcSize;
 		}