mirror of
https://github.com/RetroShare/RetroShare.git
synced 2024-10-01 02:35:48 -04:00
Merge pull request #370 from Nyfor/fix-segfault-on-close
Fix segfault on shutdown.
This commit is contained in:
commit
ad2df86ab3
@ -279,10 +279,6 @@ void *SmallObject::operator new(size_t size)
|
|||||||
#endif
|
#endif
|
||||||
|
|
||||||
RsStackMutex m(_mtx) ;
|
RsStackMutex m(_mtx) ;
|
||||||
|
|
||||||
if(!_allocator._active)
|
|
||||||
return (void*)NULL;
|
|
||||||
|
|
||||||
void *p = _allocator.allocate(size) ;
|
void *p = _allocator.allocate(size) ;
|
||||||
#ifdef DEBUG_MEMORY
|
#ifdef DEBUG_MEMORY
|
||||||
std::cerr << "new RsItem: " << p << ", size=" << size << std::endl;
|
std::cerr << "new RsItem: " << p << ", size=" << size << std::endl;
|
||||||
|
Loading…
Reference in New Issue
Block a user