libretro/scummvm
1
0
Fork 0
mirror of https://github.com/libretro/scummvm.git synced 2025-02-03 09:23:37 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

DIRECTOR: Check for invalid seeks in ProjectorArchive

Browse Source
This commit is contained in:
hax0kartik 2023-03-09 07:56:38 +05:30 committed by Eugene Sandulenko
parent 7ee8e6653c
commit 3f49fca324
1 changed files with 18 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

22
engines/director/resource.cpp
View File

@ -635,8 +635,12 @@ bool ProjectorArchive::loadArchive(Common::SeekableReadStream *stream) {
uint32 size = bigEndian ? stream->readUint32BE() : stream->readUint32LE();
uint32 dictOff = bigEndian ? stream->readUint32BE() : stream->readUint32LE();
// Jump to the actual dict block and begin parsing
stream->seek(dictOff);
// Jump to the actual dict block and parse it
if (!stream->seek(dictOff)) {
warning("ProjectorArchive::loadArchive(): Incorrect dict offset (0x%x)", dictOff);
return false;
}
tag = bigEndian ? stream->readUint32BE() : stream->readUint32LE();
size = bigEndian ? stream->readUint32BE() : stream->readUint32LE();
stream->seek(dictOff + 24);
@ -657,7 +661,12 @@ bool ProjectorArchive::loadArchive(Common::SeekableReadStream *stream) {
Common::StringArray arr(cnt);
for (uint32 i = 0; i < cnt; i++) {
stream->seek(dictOff + pt, SEEK_SET);
// if this fails it likely means that the dict was invalid.
if (!stream->seek(dictOff + pt, SEEK_SET)) {
warning("ProjectorArchive::loadArchive(): Incorrect entry name offset (0x%x)", dictOff + pt);
return false;
}
uint32 namelen = bigEndian ? stream->readUint32BE() : stream->readUint32LE();
arr[i] = stream->readString(0, namelen);
@ -682,7 +691,12 @@ bool ProjectorArchive::loadArchive(Common::SeekableReadStream *stream) {
entry.size = size + 8;
_files[arr[i]] = entry;
stream->seek(size, SEEK_CUR);
// if this fails it suggests something is either wrong with the dict or the file itself.
if (!stream->seek(size, SEEK_CUR)) {
warning("ProjectorArchive::loadArchive(): Could not read next block (0x%x) Prev Block(0x%x : %d)",
entry.offset + entry.size, entry.offset, entry.size);
return false;
}
}
return true;