1 files changed, 45 insertions, 13 deletions

diff --git a/lib/common/DebugMemLeakFinder.cpp b/lib/common/DebugMemLeakFinder.cpp
index 87cdf00d..230d7163 100644
--- a/lib/common/DebugMemLeakFinder.cpp
+++ b/lib/common/DebugMemLeakFinder.cpp
@@ -8,7 +8,7 @@
 // --------------------------------------------------------------------------
 
 
-#ifndef NDEBUG
+#ifndef BOX_RELEASE_BUILD
 
 #include "Box.h"
 
@@ -75,6 +75,13 @@ namespace
 void memleakfinder_init()
 {
 	ASSERT(!memleakfinder_initialised);
+
+	{
+		// allocates a permanent buffer on Solaris.
+		// not a leak?
+		std::ostringstream oss;
+	}
+
 	memleakfinder_initialised = true;
 }
 
@@ -146,7 +153,9 @@ void *memleakfinder_realloc(void *ptr, size_t size)
 	std::map<void *, MallocBlockInfo>::iterator i(sMallocBlocks.find(ptr));
 	if(ptr && i == sMallocBlocks.end())
 	{
-		TRACE1("Block %x realloc(), but not in list. Error? Or allocated in startup static objects?\n", ptr);
+		BOX_WARNING("Block " << ptr << " realloc()ated, but not "
+			"in list. Error? Or allocated in startup static "
+			"objects?");
 	}
 
 	void *b = ::realloc(ptr, size);
@@ -193,7 +202,9 @@ void memleakfinder_free(void *ptr)
 		}
 		else
 		{
-			TRACE1("Block %p freed, but not known. Error? Or allocated in startup static allocation?\n", ptr);
+			BOX_WARNING("Block " << ptr << " freed, but not "
+				"known. Error? Or allocated in startup "
+				"static allocation?");
 		}
 
 		if(sTrackMallocInSection)
@@ -293,16 +304,21 @@ void memleakfinder_traceblocksinsection()
 		std::map<void *, MallocBlockInfo>::const_iterator i(sMallocBlocks.find(*s));
 		if(i == sMallocBlocks.end())
 		{
-			TRACE0("Logical error in section block finding\n");
+			BOX_WARNING("Logical error in section block finding");
 		}
 		else
 		{
-			TRACE4("Block %p size %d allocated at %s:%d\n", i->first, i->second.size, i->second.file, i->second.line);
+			BOX_TRACE("Block " << i->first << " size " <<
+				i->second.size << " allocated at " <<
+				i->second.file << ":" << i->second.line);
 		}
 	}
 	for(std::map<void *, ObjectInfo>::const_iterator i(sSectionObjectBlocks.begin()); i != sSectionObjectBlocks.end(); ++i)
 	{
-		TRACE5("Object%s %p size %d allocated at %s:%d\n", i->second.array?" []":"", i->first, i->second.size, i->second.file, i->second.line);
+		BOX_TRACE("Object" << (i->second.array?" []":"") << " " <<
+			i->first << " size " << i->second.size <<
+			" allocated at " << i->second.file << 
+			":" << i->second.line);
 	}
 }
 
@@ -335,13 +351,27 @@ void memleakfinder_reportleaks_file(FILE *file)
 
 	ASSERT(!sTrackingDataDestroyed);
 
-	for(std::map<void *, MallocBlockInfo>::const_iterator i(sMallocBlocks.begin()); i != sMallocBlocks.end(); ++i)
+	for(std::map<void *, MallocBlockInfo>::const_iterator
+		i(sMallocBlocks.begin()); i != sMallocBlocks.end(); ++i)
 	{
-		if(is_leak(i->first)) ::fprintf(file, "Block 0x%p size %d allocated at %s:%d\n", i->first, i->second.size, i->second.file, i->second.line);
+		if(is_leak(i->first))
+		{
+			::fprintf(file, "Block %p size %d allocated at "
+				"%s:%d\n", i->first, i->second.size,
+				i->second.file, i->second.line);
+		}
 	}
-	for(std::map<void *, ObjectInfo>::const_iterator i(sObjectBlocks.begin()); i != sObjectBlocks.end(); ++i)
+
+	for(std::map<void *, ObjectInfo>::const_iterator
+		i(sObjectBlocks.begin()); i != sObjectBlocks.end(); ++i)
 	{
-		if(is_leak(i->first)) ::fprintf(file, "Object%s 0x%p size %d allocated at %s:%d\n", i->second.array?" []":"", i->first, i->second.size, i->second.file, i->second.line);
+		if(is_leak(i->first))
+		{
+			::fprintf(file, "Object%s %p size %d allocated at "
+				"%s:%d\n", i->second.array?" []":"",
+				i->first, i->second.size, i->second.file,
+				i->second.line);
+		}
 	}
 }
 
@@ -390,8 +420,10 @@ extern "C" void memleakfinder_atexit()
 
 void memleakfinder_setup_exit_report(const char *filename, const char *markertext)
 {
-	::strcpy(atexit_filename, filename);
-	::strcpy(atexit_markertext, markertext);
+	::strncpy(atexit_filename, filename, sizeof(atexit_filename)-1);
+	::strncpy(atexit_markertext, markertext, sizeof(atexit_markertext)-1);
+	atexit_filename[sizeof(atexit_filename)-1] = 0;
+	atexit_markertext[sizeof(atexit_markertext)-1] = 0;
 	if(!atexit_registered)
 	{
 		atexit(memleakfinder_atexit);
@@ -516,4 +548,4 @@ void operator delete(void *ptr) throw ()
 	internal_delete(ptr);
 }
 
-#endif // NDEBUG
+#endif // BOX_RELEASE_BUILD