[commit] r2520 - in trunk: GME/ConstraintManager GME/Gme SDK/DecoratorLib

[GMESRC Repository Notifications]

Author: ksmyth
Date: Wed Sep  3 10:11:25 2014
New Revision: 2520

Log:
Fix bugs from crashrpts and drmemory

Modified:
   trunk/GME/ConstraintManager/OCLType.cpp
   trunk/GME/Gme/GMEOLEData.cpp
   trunk/SDK/DecoratorLib/BitmapUtil.cpp

Modified: trunk/GME/ConstraintManager/OCLType.cpp
==============================================================================
--- trunk/GME/ConstraintManager/OCLType.cpp	Tue Aug 19 15:51:28 2014	(r2519)
+++ trunk/GME/ConstraintManager/OCLType.cpp	Wed Sep  3 10:11:25 2014	(r2520)
@@ -211,7 +211,7 @@
 				if ( (*i).second.pType->IsDynamic() )
 					i->second.pType.reset();
 				else
-					m_mapTypes.insert( TypeResultMap::value_type( std::move((*i).first), std::move((*i).second) ) );
+					m_mapTypes.insert( TypeResultMap::value_type( (*i).first, std::move((*i).second) ) );
 	}
 
 	void TypeManager::ClearGlobals()

Modified: trunk/GME/Gme/GMEOLEData.cpp
==============================================================================
--- trunk/GME/Gme/GMEOLEData.cpp	Tue Aug 19 15:51:28 2014	(r2519)
+++ trunk/GME/Gme/GMEOLEData.cpp	Wed Sep  3 10:11:25 2014	(r2520)
@@ -196,7 +196,10 @@
 	if( p!= NULL && p.QueryInterface(&source) == S_OK )
 	{
 		CComPtr<IUnknown> unknown;
-		COMTHROW( source->get_Project(&unknown) );
+		HRESULT hr = source->get_Project(&unknown);
+		if (hr == HRESULT_FROM_WIN32(RPC_S_CALL_FAILED)) // crashrpt 17f8cc45-c369-464b-8162-5dc7bf3bf04c
+			return false;
+		COMTHROW(hr);
 		ASSERT( unknown != NULL );
 
 		if (unknown == NULL)
@@ -207,7 +210,7 @@
 
 		CComPtr<IMgaProject> source_project;
 		// KMS: fixing crashrpt 8895373f-396e-490f-b882-036ba9d42961: this QI may fail
-		HRESULT hr = unknown.QueryInterface(&source_project);
+		hr = unknown.QueryInterface(&source_project);
 		if ( source_project == NULL ) {
 			ASSERT(false);
 			return false;

Modified: trunk/SDK/DecoratorLib/BitmapUtil.cpp
==============================================================================
--- trunk/SDK/DecoratorLib/BitmapUtil.cpp	Tue Aug 19 15:51:28 2014	(r2519)
+++ trunk/SDK/DecoratorLib/BitmapUtil.cpp	Wed Sep  3 10:11:25 2014	(r2520)
@@ -570,10 +570,10 @@
 	
 	if (file.Read( m_pBits, dwLength - dwReadBytes ) != (dwLength - dwReadBytes))
 	{
-		delete m_pBMI;
+		delete[] m_pBMI;
 		m_pBMI = NULL;
 		
-		delete m_pBits;
+		delete[] m_pBits;
 		m_pBits = NULL;
 		
 		return 0;
@@ -691,7 +691,7 @@
 		
 		m_pPalette = new CPalette;
 		bResult = m_pPalette->CreatePalette( pLogPal );
-		delete pLogPal;
+		delete[] pLogPal;
 	}
 	
 	return bResult;