Changeset 47010 in webkit for trunk/JavaScriptCore/wtf/FastMalloc.h

Timestamp:

Aug 10, 2009, 4:17:34 PM (16 years ago)

Author:

[email protected]

Message:

Fix hundreds of "pointer being freed was not allocated" errors seen on the build bot.

Reviewed by Darin Adler.

• wtf/FastMalloc.h: Implement nothrow variants of the delete and delete[] operators since

we implement the nothrow variants of new and new[]. The nothrow variant of delete is called
explicitly in the implementation of std::sort which was resulting in FastMalloc-allocated
memory being passed to the system allocator to free.

File:

• trunk/JavaScriptCore/wtf/FastMalloc.h (modified) (1 diff)

trunk/JavaScriptCore/wtf/FastMalloc.h

@@ -185 +185 @@
 WTF_PRIVATE_INLINE void* operator new(size_t size, const std::nothrow_t&) throw() { return fastMalloc(size); }
 WTF_PRIVATE_INLINE void operator delete(void* p) { fastFree(p); }
+WTF_PRIVATE_INLINE void operator delete(void* p, const std::nothrow_t&) throw() { fastFree(p); }
 WTF_PRIVATE_INLINE void* operator new[](size_t size) { return fastMalloc(size); }
 WTF_PRIVATE_INLINE void* operator new[](size_t size, const std::nothrow_t&) throw() { return fastMalloc(size); }
 WTF_PRIVATE_INLINE void operator delete[](void* p) { fastFree(p); }
+WTF_PRIVATE_INLINE void operator delete[](void* p, const std::nothrow_t&) throw() { fastFree(p); }
 
 #endif