From 800cc281c570e18f989d98e240fa62de0d9b5b00 Mon Sep 17 00:00:00 2001
From: csoler <retroshare.project@gmail.com>
Date: Wed, 2 Mar 2011 14:33:32 +0000
Subject: [PATCH] suppressed potential SIGSEGV as exit time

git-svn-id: http://svn.code.sf.net/p/retroshare/code/trunk@4068 b45a01b8-16f6-495d-af2f-9b41ad6348cc
---
 libretroshare/src/util/smallobject.cc | 19 +++++++++++++++++++
 libretroshare/src/util/smallobject.h  |  4 ++++
 2 files changed, 23 insertions(+)

diff --git a/libretroshare/src/util/smallobject.cc b/libretroshare/src/util/smallobject.cc
index 0f312a0a2..ab7a6bf96 100644
--- a/libretroshare/src/util/smallobject.cc
+++ b/libretroshare/src/util/smallobject.cc
@@ -170,14 +170,21 @@ void FixedAllocator::printStatistics() const
 SmallObjectAllocator::SmallObjectAllocator(size_t maxObjectSize)
 	: _maxObjectSize(maxObjectSize)
 {
+	RsStackMutex m(SmallObject::_mtx) ;
+
 	_lastAlloc = NULL ;
 	_lastDealloc = NULL ;
+	_active = true ;
 }
 
 SmallObjectAllocator::~SmallObjectAllocator()
 {
+	RsStackMutex m(SmallObject::_mtx) ;
+
 	for(std::map<int,FixedAllocator*>::const_iterator it(_pool.begin());it!=_pool.end();++it)
 		delete it->second ;
+
+	_active = false ;
 }
 
 void *SmallObjectAllocator::allocate(size_t bytes)
@@ -255,6 +262,10 @@ void *SmallObject::operator new(size_t size)
 #endif
 
 	RsStackMutex m(_mtx) ;
+
+	if(!_allocator._active)
+		return (void*)NULL;
+
 	void *p = _allocator.allocate(size) ;
 #ifdef DEBUG_MEMORY
 	std::cerr << "new RsItem: " << p << ", size=" << size << std::endl;
@@ -265,6 +276,10 @@ void *SmallObject::operator new(size_t size)
 void SmallObject::operator delete(void *p,size_t size)
 {
 	RsStackMutex m(_mtx) ;
+
+	if(!_allocator._active)
+		return ;
+
 	_allocator.deallocate(p,size) ;
 #ifdef DEBUG_MEMORY
 	std::cerr << "del RsItem: " << p << ", size=" << size << std::endl;
@@ -274,6 +289,10 @@ void SmallObject::operator delete(void *p,size_t size)
 void SmallObject::printStatistics() 
 {
 	RsStackMutex m(_mtx) ;
+
+	if(!_allocator._active)
+		return ;
+
 	_allocator.printStatistics() ;
 }
 
diff --git a/libretroshare/src/util/smallobject.h b/libretroshare/src/util/smallobject.h
index 030542ac4..a745ad9ba 100644
--- a/libretroshare/src/util/smallobject.h
+++ b/libretroshare/src/util/smallobject.h
@@ -85,6 +85,8 @@ namespace RsMemoryManagement
 			void deallocate(void *p,size_t size) ;
 
 			void printStatistics() const ;
+
+			bool _active ;
 		private:
 			std::map<int,FixedAllocator*> _pool ;
 			FixedAllocator *_lastAlloc ;
@@ -105,6 +107,8 @@ namespace RsMemoryManagement
 		private:
 			static SmallObjectAllocator _allocator ;
 			static RsMutex _mtx;
+
+			friend class SmallObjectAllocator ;
 	};
 
 	extern void printStatistics() ;