[Hgengine-cvs] SF.net SVN: hgengine:[715] Mercury2/src/MercuryMatrix.cpp

[<axl...@us...>]

Revision: 715
          http://hgengine.svn.sourceforge.net/hgengine/?rev=715&view=rev
Author:   axlecrusher
Date:     2010-04-29 23:53:04 +0000 (Thu, 29 Apr 2010)

Log Message:
-----------
force a hard crash if we run out of memory

Modified Paths:
--------------
    Mercury2/src/MercuryMatrix.cpp

Modified: Mercury2/src/MercuryMatrix.cpp
===================================================================
--- Mercury2/src/MercuryMatrix.cpp	2010-04-29 10:50:54 UTC (rev 714)
+++ Mercury2/src/MercuryMatrix.cpp	2010-04-29 23:53:04 UTC (rev 715)
@@ -23,13 +23,14 @@
 
 FloatRow* MercuryMatrixMemory::GetNewMatrix()
 {
-	MatrixArray* m = (MatrixArray*)0xdeadbeef;
+	MatrixArray* m = (MatrixArray*)0x0;
 	MSemaphoreLock lock(&m_lock);
 	if ( m_free.begin() != m_free.end() )
 	{
 		m = m_free.front();
 		m_free.pop_front();
 	}
+	if (m==0x0) ***m=0;
 	return (FloatRow*)m;
 }
 


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