Changeset 25483 in webkit for trunk/JavaScriptCore/wtf/FastMalloc.cpp

Timestamp:

Sep 10, 2007, 5:16:51 PM (18 years ago)

Author:

thatcher

Message:

Reviewed by Darin Adler.

<rdar://problem/5456224> CrashTracer: [USER] 2 crashes in Toast Titanium at com.apple.CoreServices.CarbonCore: CSMemDisposePtr + 37

Removed the implementation of these malloc zone functions. We do not have the ability to
check if a pointer is valid or not, so we can't correctly implement them. The system free
does not fail if you pass in a bad pointer.

• wtf/FastMalloc.cpp: (WTF::FastMallocZone::size): (WTF::FastMallocZone::zoneMalloc): (WTF::FastMallocZone::zoneCalloc): (WTF::FastMallocZone::zoneFree): (WTF::FastMallocZone::zoneRealloc):

File:

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

trunk/JavaScriptCore/wtf/FastMalloc.cpp

@@ -2615 +2615 @@
 }
 
-
-size_t FastMallocZone::size(malloc_zone_t* zone, const void* ptr)
+size_t FastMallocZone::size(malloc_zone_t*, const void*)
 {
-    if (!ptr || !pageheap)
-        return 0;
-
-    const PageID p = reinterpret_cast<uintptr_t>(ptr) >> kPageShift;
-    Span* span = pageheap->GetDescriptorEnsureSafe(p);
-    if (!span)
-        return 0;
-
-    if (span->sizeclass == 0)
-        return span->length * kPageSize;
-
-    return ByteSizeForClass(span->sizeclass);
-}
-
-void* FastMallocZone::zoneMalloc(malloc_zone_t* zone, size_t size)
+    return 0;
+}
+
+void* FastMallocZone::zoneMalloc(malloc_zone_t*, size_t)
 {
-    return fastMalloc(size);
-}
-
-void* FastMallocZone::zoneCalloc(malloc_zone_t*, size_t numItems, size_t size)
+    return 0;
+}
+
+void* FastMallocZone::zoneCalloc(malloc_zone_t*, size_t, size_t)
 {
-    return fastCalloc(numItems, size);
-}
-
-void FastMallocZone::zoneFree(malloc_zone_t*, void* ptr)
+    return 0;
+}
+
+void FastMallocZone::zoneFree(malloc_zone_t*, void*)
 {
-    return fastFree(ptr);
-}
-
-void* FastMallocZone::zoneRealloc(malloc_zone_t*, void* ptr, size_t size)
+}
+
+void* FastMallocZone::zoneRealloc(malloc_zone_t*, void*, size_t)
 {
-    return fastRealloc(ptr, size);
+    return 0;
 }