libretro/scummvm
1
0
Fork 0
mirror of https://github.com/libretro/scummvm.git synced 2024-12-16 06:39:17 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

CGE: Fix SPR files with extra 0x1A or missing ending CRLF. Fix bug #3537527

Browse Source
This commit is contained in:
Strangerke 2012-06-25 23:33:17 +02:00
parent 7b44c20eb1
commit 80388527ea
1 changed files with 22 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

25
engines/cge/fileio.cpp
View File

@ -201,9 +201,28 @@ EncryptedStream::EncryptedStream(CGEEngine *vm, const char *name) : _vm(vm) {
_error = true;
_vm->_resman->seek(kp->_pos);
byte *dataBuffer = (byte *)malloc(kp->_size);
_vm->_resman->read(dataBuffer, kp->_size);
_readStream = new Common::MemoryReadStream(dataBuffer, kp->_size, DisposeAfterUse::YES);
byte *dataBuffer;
int bufSize;
if ((strlen(name) > 4) && (scumm_stricmp(name + strlen(name) - 4, ".SPR") == 0)) {
// SPR files have some inconsistencies. Some have extra 0x1A at the end, some others
// do not have a carriage return at the end of the last line
// Therefore, we remove this ending 0x1A and add extra new lines.
// This fixes bug #3537527
dataBuffer = (byte *)malloc(kp->_size + 2);
_vm->_resman->read(dataBuffer, kp->_size);
if (dataBuffer[kp->_size - 1] == 0x1A)
dataBuffer[kp->_size - 1] = '\n';
dataBuffer[kp->_size] = '\n';
dataBuffer[kp->_size + 1] = '\n';
bufSize = kp->_size + 2;
} else {
dataBuffer = (byte *)malloc(kp->_size);
_vm->_resman->read(dataBuffer, kp->_size);
bufSize = kp->_size;
}
_readStream = new Common::MemoryReadStream(dataBuffer, bufSize, DisposeAfterUse::YES);
}
uint32 EncryptedStream::read(void *dataPtr, uint32 dataSize) {