General

- Added format auto-detection to most loaders
  - Simplified BaseImporter::CanRead() with some utility methods
  - improved fast_atof -> no overruns anymore. Fuck you, irrlicht.
  - added assimp_cmd tool to allow command line model processing. Mainly adebugging tool for internal purposes, but others might find it useful, too.
  - vc8/vc9: revision number is now written to DLL version header
  - mkutil: some batch scripts to simplify tagging & building of release versions
  - some API cleanup
  - fixing some doxygen markup (+now explicit use of @file <filename>)
  - Icon for assimp_view and assimp_cmd

3DS
  - Normal vectors are not anymore inverted in some cases
  - Improved pivot handling
  - Improved handling of x-flipped meshes

Collada
  - fixed a minor bug (visual_scene element)

LWS 
  - WIP implementation. No animations yet, some bugs and crashes.
  - Animation system remains disabled, WIP code
  - many test files for LWS, but most of them test the anim support, which is, read above, currently disabled.

STL
  - fixing a log warning which appears for every model
  - added binary&ascii test spider, exported from truespace

MD3 
  - Cleaning up output tags for automatically joined player models.


IRR
  - Fixing coordinate system issues. 
  - Instance handling improved.
  - Some of the reported crashes not yet fixed.

PretransformVertices
  - Numerous performance improvements.
  - Added config option to preserve the hierarchy during the step.

RemoveRedundantMaterials
  - Added config option to specify a list of materials which are kept in every case.

UNREAL
  - Added support for the old unreal data format (*.a,*.d,*.uc)
  - tested only with exports from Milkshape
  - more Unreal stuff to come soon



git-svn-id: https://assimp.svn.sourceforge.net/svnroot/assimp/trunk@356 67173fc5-114c-0410-ac8e-9d2fd5bffc1f

code/DefaultLogger.cpp

@@ -51,6 +51,13 @@ OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 #include "StdOStreamLogStream.h"
 #include "FileLogStream.h"
 
+#ifndef ASSIMP_BUILD_SINGLETHREADED
+#	include <boost/thread/thread.hpp>
+#	include <boost/thread/mutex.hpp>
+
+boost::mutex loggerMutex;
+#endif
+
 namespace Assimp	{
 
 // ----------------------------------------------------------------------------------
@@ -119,6 +126,11 @@ Logger *DefaultLogger::create(const char* name /*= "AssimpLog.txt"*/,
 	unsigned int defStreams                    /*= DLS_DEBUGGER | DLS_FILE*/,
 	IOSystem* io		                       /*= NULL*/)
 {
+	// enter the mutex here to avoid concurrency problems
+#ifndef ASSIMP_BUILD_SINGLETHREADED
+	boost::mutex::scoped_lock lock(loggerMutex);
+#endif
+
 	if (m_pLogger && !isNullLogger() )
 		delete m_pLogger;
 
@@ -146,31 +158,56 @@ Logger *DefaultLogger::create(const char* name /*= "AssimpLog.txt"*/,
 
 // ----------------------------------------------------------------------------------
 void Logger::debug(const std::string &message)	{
-	ai_assert(message.length()<=Logger::MAX_LOG_MESSAGE_LENGTH);
+
+	// SECURITY FIX: otherwise it's easy to produce overruns ...
+	if (message.length()>MAX_LOG_MESSAGE_LENGTH) {
+		ai_assert(false);
+		return;
+	}
 	return OnDebug(message.c_str());
 }
 
 // ----------------------------------------------------------------------------------
 void Logger::info(const std::string &message)	{
-	ai_assert(message.length()<=Logger::MAX_LOG_MESSAGE_LENGTH);
+	
+	// SECURITY FIX: otherwise it's easy to produce overruns ...
+	if (message.length()>MAX_LOG_MESSAGE_LENGTH) {
+		ai_assert(false);
+		return;
+	}
 	return OnInfo(message.c_str());
 }
 	
 // ----------------------------------------------------------------------------------
 void Logger::warn(const std::string &message)	{
-	ai_assert(message.length()<=Logger::MAX_LOG_MESSAGE_LENGTH);
+	
+	// SECURITY FIX: otherwise it's easy to produce overruns ...
+	if (message.length()>MAX_LOG_MESSAGE_LENGTH) {
+		ai_assert(false);
+		return;
+	}
 	return OnWarn(message.c_str());
 }
 
 // ----------------------------------------------------------------------------------
 void Logger::error(const std::string &message)	{
-	ai_assert(message.length()<=Logger::MAX_LOG_MESSAGE_LENGTH);
+	
+	// SECURITY FIX: otherwise it's easy to produce overruns ...
+	if (message.length()>MAX_LOG_MESSAGE_LENGTH) {
+		ai_assert(false);
+		return;
+	}
 	return OnError(message.c_str());
 }
 
 // ----------------------------------------------------------------------------------
 void DefaultLogger::set( Logger *logger )
 {
+	// enter the mutex here to avoid concurrency problems
+#ifndef ASSIMP_BUILD_SINGLETHREADED
+	boost::mutex::scoped_lock lock(loggerMutex);
+#endif
+
 	if (!logger)logger = &s_pNullLogger;
 	if (m_pLogger && !isNullLogger() )
 		delete m_pLogger;
@@ -195,6 +232,11 @@ Logger *DefaultLogger::get()
 //	Kills the only instance
 void DefaultLogger::kill()
 {
+	// enter the mutex here to avoid concurrency problems
+#ifndef ASSIMP_BUILD_SINGLETHREADED
+	boost::mutex::scoped_lock lock(loggerMutex);
+#endif
+
 	if (m_pLogger != &s_pNullLogger)return;
 	delete m_pLogger;
 	m_pLogger = &s_pNullLogger;
@@ -243,23 +285,14 @@ void DefaultLogger::OnError( const char* message )
 	WriteToStreams( msg, Logger::ERR );
 }
 
-// ----------------------------------------------------------------------------------
-//	Severity setter
-void DefaultLogger::setLogSeverity( LogSeverity log_severity )
-{
-	m_Severity = log_severity;
-}
-
 // ----------------------------------------------------------------------------------
 //	Attachs a new stream
-void DefaultLogger::attachStream( LogStream *pStream, unsigned int severity )
+bool DefaultLogger::attachStream( LogStream *pStream, unsigned int severity )
 {
 	if (!pStream)
-		return;
+		return false;
 
-	// fix (Aramis)
-	if (0 == severity)
-	{
+	if (0 == severity)	{
 		severity = Logger::INFO | Logger::ERR | Logger::WARN | Logger::DEBUGGING;
 	}
 
@@ -270,24 +303,23 @@ void DefaultLogger::attachStream( LogStream *pStream, unsigned int severity )
 		if ( (*it)->m_pStream == pStream )
 		{
 			(*it)->m_uiErrorSeverity |= severity;
-			return;
+			return true;
 		}
 	}
 	
 	LogStreamInfo *pInfo = new LogStreamInfo( severity, pStream );
 	m_StreamArray.push_back( pInfo );
+	return true;
 }
 
 // ----------------------------------------------------------------------------------
 //	Detatch a stream
-void DefaultLogger::detatchStream( LogStream *pStream, unsigned int severity )
+bool DefaultLogger::detatchStream( LogStream *pStream, unsigned int severity )
 {
 	if (!pStream)
-		return;
+		return false;
 
-	// fix (Aramis)
-	if (0 == severity)
-	{
+	if (0 == severity)	{
 		severity = Logger::INFO | Logger::ERR | Logger::WARN | Logger::DEBUGGING;
 	}
 	
@@ -303,15 +335,17 @@ void DefaultLogger::detatchStream( LogStream *pStream, unsigned int severity )
 				m_StreamArray.erase( it );
 				break;
 			}
+			return true;
 		}
 	}
+	return false;
 }
 
 // ----------------------------------------------------------------------------------
 //	Constructor
 DefaultLogger::DefaultLogger(LogSeverity severity) 
 
-	:	m_Severity	( severity )
+	:	Logger	( severity )
 	,	noRepeatMsg	(false)
 	,	lastLen( 0 )
 {