From 7c7cb6c836ad901b31849782238cd9226dc651ec Mon Sep 17 00:00:00 2001 From: Thierry Crozat Date: Fri, 28 Dec 2018 21:13:40 +0100 Subject: GLK: Fix out of bound access in detection code This caused some random asserts when for example trying to add any game as Common::Str::hasSuffixIgnoreCase could be called with a null pointer. --- engines/glk/magnetic/detection.cpp | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'engines/glk/magnetic/detection.cpp') diff --git a/engines/glk/magnetic/detection.cpp b/engines/glk/magnetic/detection.cpp index 279f509a39..91d63ccace 100644 --- a/engines/glk/magnetic/detection.cpp +++ b/engines/glk/magnetic/detection.cpp @@ -46,7 +46,7 @@ MagneticDescriptor MagneticMetaEngine::findGame(const char *gameId) { } bool MagneticMetaEngine::detectGames(const Common::FSList &fslist, DetectedGames &gameList) { - const char *const EXTENSIONS[3] = { ".magnetic" }; + const char *const EXTENSIONS[1] = { ".magnetic" }; // Loop through the files of the folder for (Common::FSList::const_iterator file = fslist.begin(); file != fslist.end(); ++file) { @@ -55,7 +55,7 @@ bool MagneticMetaEngine::detectGames(const Common::FSList &fslist, DetectedGames continue; Common::String filename = file->getName(); bool hasExt = false; - for (int idx = 0; idx < 3 && !hasExt; ++idx) + for (int idx = 0; idx < 1 && !hasExt; ++idx) hasExt = filename.hasSuffixIgnoreCase(EXTENSIONS[idx]); if (!hasExt) continue; -- cgit v1.2.3