From f2fe352c0030136bf2d54beb8deec14bf1e39ccf Mon Sep 17 00:00:00 2001 From: Nathanael Gentry Date: Mon, 3 Aug 2020 13:29:05 -0400 Subject: [PATCH] DIRECTOR: Gracefully exit on bad EXE --- engines/director/resource.cpp | 3 +++ 1 file changed, 3 insertions(+) diff --git a/engines/director/resource.cpp b/engines/director/resource.cpp index a898af5eee9..a723a29e90f 100644 --- a/engines/director/resource.cpp +++ b/engines/director/resource.cpp @@ -192,6 +192,9 @@ void Stage::loadEXE(const Common::String movie) { error("Failed to load RIFF"); } else { Common::WinResources *exe = Common::WinResources::createFromEXE(movie); + if (!exe) + error("Failed to open EXE '%s'", g_director->getEXEName().c_str()); + const Common::Array versions = exe->getIDList(Common::kWinVersion); for (uint i = 0; i < versions.size(); i++) { Common::SeekableReadStream *res = exe->getResource(Common::kWinVersion, versions[i]);