[Scummvm-cvs-logs] scummvm master -> e2238e4a25904f36f3cf3f91b9a4db7db22f6508

[lordhoto]

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

Summary:
bdb12a9c65 SCUMM: Fix bug #3493317 by removing assert() in detection algorithm.
e2238e4a25 Merge pull request #234 from BenCastricum/master


Commit: bdb12a9c658fa0e8661c7a8370f1d926ed31ae62
    https://github.com/scummvm/scummvm/commit/bdb12a9c658fa0e8661c7a8370f1d926ed31ae62
Author: Ben Castricum (github at bencastricum.nl)
Date: 2012-04-28T02:10:53-07:00

Commit Message:
SCUMM: Fix bug #3493317 by removing assert() in detection algorithm.

Bug #3493317 ("SCUMM: Detecting Loom PCE without 16bpp support crashes")
is caused by an assert() in detection algorithm. In case an MD5 is found
the md5table, but the variant from the md5table is not found in
detection_tables.h this assert triggers. However since certain variants
can be left out compile-time this situation can occur. By ignoring
instead of assert()-ing the entry ScummVM will no longer abort but
continue the detection process.

Changed paths:
    engines/scumm/detection.cpp



diff --git a/engines/scumm/detection.cpp b/engines/scumm/detection.cpp
index b47982a..2da0abb 100644
--- a/engines/scumm/detection.cpp
+++ b/engines/scumm/detection.cpp
@@ -589,11 +589,11 @@ static void detectGames(const Common::FSList &fslist, Common::List<DetectorResul
 						file.c_str(), md5str.c_str(), filesize);
 
 					// Sanity check: We *should* have found a matching gameid / variant at this point.
-					// If not, then there's a bug in our data tables...
-					assert(dr.game.gameid != 0);
-
-					// Add it to the list of detected games
-					results.push_back(dr);
+					// If not, we may have #ifdef'ed the entry out in our detection_tables.h because we
+					// don't have the required stuff compiled in, or there's a bug in our data tables...
+					if (dr.game.gameid != 0)
+						// Add it to the list of detected games
+						results.push_back(dr);
 				}
 			}
 


Commit: e2238e4a25904f36f3cf3f91b9a4db7db22f6508
    https://github.com/scummvm/scummvm/commit/e2238e4a25904f36f3cf3f91b9a4db7db22f6508
Author: Johannes Schickel (lordhoto at gmail.com)
Date: 2012-04-28T08:07:52-07:00

Commit Message:
Merge pull request #234 from BenCastricum/master

SCUMM: Fix bug #3493317 by removing assert() in detection algorithm. 

Changed paths:
    engines/scumm/detection.cpp