[commit] r1731 - trunk/GME/Core

[GMESRC Repository Notifications]

Author: ksmyth
Date: Mon Dec  5 13:24:58 2011
New Revision: 1731

Log:
Fix out-of-bounds with upgrading .mga file to new registry format

Modified:
   trunk/GME/Core/CoreBinFile.cpp

Modified: trunk/GME/Core/CoreBinFile.cpp
==============================================================================
--- trunk/GME/Core/CoreBinFile.cpp	Mon Dec  5 13:24:47 2011	(r1730)
+++ trunk/GME/Core/CoreBinFile.cpp	Mon Dec  5 13:24:58 2011	(r1731)
@@ -1048,7 +1048,11 @@
 		ASSERT( objid != OBJID_NONE );
 
 		maxobjids_iterator i = maxobjids.find(metaid);
-		ASSERT( i != maxobjids.end() );
+		if (i == maxobjids.end())
+		{
+			// e.g. 0x79==121: registry node from old-style registry
+			i = maxobjids.insert(maxobjids_type::value_type(metaid, 1)).first;
+		}
 
 		if( i->second < objid )
 			i->second = objid;