[Scummvm-cvs-logs] SF.net SVN: scummvm: [25966] scummvm/trunk/engines/scumm/plugin.cpp

[fingolfin at users.sourceforge.net]

Revision: 25966
          http://scummvm.svn.sourceforge.net/scummvm/?rev=25966&view=rev
Author:   fingolfin
Date:     2007-03-04 01:41:58 -0800 (Sun, 04 Mar 2007)

Log Message:
-----------
Avoid crash in Engine_SCUMM_create when an inconsistent platform override is present

Modified Paths:
--------------
    scummvm/trunk/engines/scumm/plugin.cpp

Modified: scummvm/trunk/engines/scumm/plugin.cpp
===================================================================
--- scummvm/trunk/engines/scumm/plugin.cpp	2007-03-04 09:27:28 UTC (rev 25965)
+++ scummvm/trunk/engines/scumm/plugin.cpp	2007-03-04 09:41:58 UTC (rev 25966)
@@ -1602,6 +1602,12 @@
 			}
 		}
 	}
+	
+	// If we narrowed it down too much, abort
+	if (results.empty()) {
+		warning("Engine_SCUMM_create: Game data inconsistent with platform override");
+		return kNoGameDataFoundError;
+	}
 
 	// Still no unique match found -> we just use the first one
 	if (results.size() > 1) {


This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.