libretro/scummvm
1
0
Fork 0
mirror of https://github.com/libretro/scummvm.git synced 2025-01-31 07:53:36 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

STARK: Alloc PEResources on heap to avoid stack overflow

Browse Source
This commit is contained in:
Paweł Kołodziejski 2022-01-31 00:41:10 +01:00
parent 11946ca784
commit 554c64acf1
No known key found for this signature in database
GPG Key ID: 0BDADC9E74440FF7
1 changed files with 7 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
engines/stark/ui/dialogbox.cpp
View File

@ -215,9 +215,10 @@ void DialogBox::onKeyPress(const Common::KeyState &keyState) {
}
Graphics::Surface *DialogBox::loadBackground() {
Common::PEResources executable;
if (!executable.loadFromEXE("game.exe") && !executable.loadFromEXE("game.dll")) {
Common::PEResources *executable = new Common::PEResources();
if (!executable->loadFromEXE("game.exe") && !executable->loadFromEXE("game.dll")) {
warning("Unable to load 'game.exe' to read the modal dialog background image");
delete executable;
return nullptr;
}
@ -228,12 +229,14 @@ Graphics::Surface *DialogBox::loadBackground() {
// so we skip trying to retrieve it.
if (_vm->getGameFlags() & GF_MISSING_EXE_RESOURCES) {
warning("Steam version does not contain the modal dialog background bitmap in 'game.exe'. Using fallback color for dialog background...");
delete executable;
return nullptr;
}
Common::SeekableReadStream *stream = executable.getResource(Common::kWinBitmap, 147);
Common::SeekableReadStream *stream = executable->getResource(Common::kWinBitmap, 147);
if (!stream) {
warning("Unable to find the modal dialog background bitmap in 'game.exe'");
delete executable;
return nullptr;
}
@ -248,6 +251,7 @@ Graphics::Surface *DialogBox::loadBackground() {
stream->read(bitmapWithHeader + 14, stream->size());
delete stream;
delete executable;
Common::MemoryReadStream bitmapWithHeaderReadStream(bitmapWithHeader, bitmapWithHeaderLen);