Changeset 179915 in webkit

Timestamp:

Feb 10, 2015, 8:54:03 PM (12 years ago)

Author:

Darin Adler

Message:

Add the crash-on-failure behavior to bmalloc-based fastMalloc
​https://bugs.webkit.org/show_bug.cgi?id=141434

Reviewed by Alexey Proskuryakov.

• wtf/FastMalloc.cpp: Removed unneeded includes.

(WTF::fastMalloc): Added null check and CRASH.
(WTF::fastCalloc): Added overflow checking, null check, and CRASH.
(WTF::fastRealloc): Added null check and CRASH.
(WTF::fastMallocSize): Added FIXME comment.
(WTF::fastMallocGoodSize): Added FIXME comment.
(WTF::fastAlignedMalloc): Added null check and CRASH.
(WTF::tryFastMalloc): Changed to call bmalloc directly instead of
calling fastMalloc, since fastMalloc will now crash on failure.
(WTF::tryFastRealloc): Changed to call bmalloc directly instead of
calling fastRealloc, since fastRealloc will now crash on failure.
(WTF::tryFastCalloc): Added overflow checking.
(WTF::fastMallocStatistics): Added FIXME comment.

Location:

trunk/Source/WTF

Files:

• ChangeLog (modified) (1 diff)
• wtf/FastMalloc.cpp (modified) (5 diffs)

trunk/Source/WTF/ChangeLog

@@ +1 @@
+2015-02-10  Darin Adler  <darin@apple.com>
+
+        Add the crash-on-failure behavior to bmalloc-based fastMalloc
+        https://bugs.webkit.org/show_bug.cgi?id=141434
+
+        Reviewed by Alexey Proskuryakov.
+
+        * wtf/FastMalloc.cpp: Removed unneeded includes.
+        (WTF::fastMalloc): Added null check and CRASH.
+        (WTF::fastCalloc): Added overflow checking, null check, and CRASH.
+        (WTF::fastRealloc): Added null check and CRASH.
+        (WTF::fastMallocSize): Added FIXME comment.
+        (WTF::fastMallocGoodSize): Added FIXME comment.
+        (WTF::fastAlignedMalloc): Added null check and CRASH.
+        (WTF::tryFastMalloc): Changed to call bmalloc directly instead of
+        calling fastMalloc, since fastMalloc will now crash on failure.
+        (WTF::tryFastRealloc): Changed to call bmalloc directly instead of
+        calling fastRealloc, since fastRealloc will now crash on failure.
+        (WTF::tryFastCalloc): Added overflow checking.
+        (WTF::fastMallocStatistics): Added FIXME comment.
+
 2015-02-10  Carlos Garcia Campos  <cgarcia@igalia.com>
 

trunk/Source/WTF/wtf/FastMalloc.cpp

@@ -1 +1 @@
 // Copyright (c) 2005, 2007, Google Inc.
 // All rights reserved.
-// Copyright (C) 2005, 2006, 2007, 2008, 2009, 2011, 2015 Apple Inc. All rights reserved.
+// Copyright (C) 2005-2009, 2011, 2015 Apple Inc. All rights reserved.
 // 
 // Redistribution and use in source and binary forms, with or without
@@ -78 +78 @@
 #include "FastMalloc.h"
 
-#include "Assertions.h"
+#include "CheckedArithmetic.h"
 #include "CurrentTime.h"
-
 #include <limits>
+#include <string.h>
+#include <wtf/DataLog.h>
+
 #if OS(WINDOWS)
 #include <windows.h>
@@ -87 +89 @@
 #include <pthread.h>
 #endif
-#include <string.h>
-#include <wtf/DataLog.h>
-#include <wtf/StdLibExtras.h>
 
 #if OS(DARWIN)
@@ -274 +273 @@
 void* fastMalloc(size_t size)
 {
+    void* result = bmalloc::api::malloc(size);
+    if (!result)
+        CRASH();
+    return result;
+}
+
+void* fastCalloc(size_t numElements, size_t elementSize)
+{
+    Checked<size_t> checkedSize = elementSize;
+    checkedSize *= numElements;
+    void* result = fastZeroedMalloc(checkedSize.unsafeGet());
+    if (!result)
+        CRASH();
+    return result;
+}
+
+void* fastRealloc(void* object, size_t size)
+{
+    void* result = bmalloc::api::realloc(object, size);
+    if (!result)
+        CRASH();
+    return result;
+}
+
+void fastFree(void* object)
+{
+    bmalloc::api::free(object);
+}
+
+size_t fastMallocSize(const void*)
+{
+    // FIXME: This is incorrect; best fix is probably to remove this function.
+    // Caller currently are all using this for assertion, not to actually check
+    // the size of the allocation, so maybe we can come up with something for that.
+    return 1;
+}
+
+size_t fastMallocGoodSize(size_t size)
+{
+    // FIXME: This is non-helpful; fastMallocGoodSize will be removed soon.
+    return size;
+}
+
+void* fastAlignedMalloc(size_t alignment, size_t size) 
+{
+    void* result = bmalloc::api::memalign(alignment, size);
+    if (!result)
+        CRASH();
+    return result;
+}
+
+void fastAlignedFree(void* p) 
+{
+    bmalloc::api::free(p);
+}
+
+TryMallocReturnValue tryFastMalloc(size_t size)
+{
     return bmalloc::api::malloc(size);
 }
-
-void* fastCalloc(size_t numElements, size_t elementSize)
-{
-    return fastZeroedMalloc(numElements * elementSize);
-}
     
-void* fastRealloc(void* object, size_t size)
+TryMallocReturnValue tryFastRealloc(void* object, size_t size)
 {
     return bmalloc::api::realloc(object, size);
-}
-    
-void fastFree(void* object)
-{
-    bmalloc::api::free(object);
-}
-    
-size_t fastMallocSize(const void*)
-{
-    return 1;
-}
-    
-size_t fastMallocGoodSize(size_t size)
-{
-    return size;
-}
-    
-void* fastAlignedMalloc(size_t alignment, size_t size) 
-{
-    return bmalloc::api::memalign(alignment, size);
-}
-
-void fastAlignedFree(void* p) 
-{
-    bmalloc::api::free(p);
-}
-
-TryMallocReturnValue tryFastMalloc(size_t size)
-{
-    return fastMalloc(size);
-}
-    
-TryMallocReturnValue tryFastRealloc(void* p, size_t n)
-{
-    return fastRealloc(p, n);
 }
     
 TryMallocReturnValue tryFastCalloc(size_t numElements, size_t elementSize)
 {
-    return tryFastZeroedMalloc(numElements * elementSize);
+    Checked<size_t, RecordOverflow> checkedSize = elementSize;
+    checkedSize *= numElements;
+    if (checkedSize.hasOverflowed())
+        return nullptr;
+    return tryFastZeroedMalloc(checkedSize.unsafeGet());
 }
     
@@ -339 +360 @@
 FastMallocStatistics fastMallocStatistics()
 {
+    // FIXME: This is incorrect; needs an implementation or to be removed.
     FastMallocStatistics statistics = { 0, 0, 0 };
     return statistics;