[Scummvm-git-logs] scummvm master -> 5a29aa8812ca523f79a5ca5b492862762dbd19e4

digitall dgturner at iee.org
Sun Nov 11 09:19:13 CET 2018


This automated email contains information about 1 new commit which have been
pushed to the 'scummvm' repo located at https://github.com/scummvm/scummvm .

Summary:
5a29aa8812 ENGINES: Fix Crash in Fallback Detector Game Title Naming.


Commit: 5a29aa8812ca523f79a5ca5b492862762dbd19e4
    https://github.com/scummvm/scummvm/commit/5a29aa8812ca523f79a5ca5b492862762dbd19e4
Author: D G Turner (digitall at scummvm.org)
Date: 2018-11-11T08:16:11Z

Commit Message:
ENGINES: Fix Crash in Fallback Detector Game Title Naming.

This is a regression from 90b78c544657bf0fc41d6b86276a0873060345b5

This commit restores the previous behaviour and avoids a null
pointer dereference induced crash.

This fixes the root cause of bug Trac #10515.

Changed paths:
    engines/advancedDetector.cpp


diff --git a/engines/advancedDetector.cpp b/engines/advancedDetector.cpp
index 6f4efcf..26b06b6 100644
--- a/engines/advancedDetector.cpp
+++ b/engines/advancedDetector.cpp
@@ -91,7 +91,11 @@ DetectedGame AdvancedMetaEngine::toDetectedGame(const ADDetectedGame &adGame) co
 		extra = "";
 	} else {
 		const PlainGameDescriptor *pgd = findPlainGameDescriptor(desc->gameId, _gameIds);
-		title = pgd->description;
+		if (pgd) {
+			title = pgd->description;
+		} else {
+			title = "";
+		}
 		extra = desc->extra;
 	}
 





More information about the Scummvm-git-logs mailing list