Changeset 48000 in webkit for trunk/JavaScriptCore/jit

Timestamp:

Sep 2, 2009, 5:18:52 PM (16 years ago)

Author:

[email protected]

Message:

Should crash if JIT code buffer allocation fails.

Patch by Gavin Barraclough <​[email protected]> on 2009-09-02
​https://bugs.webkit.org/show_bug.cgi?id=28926
<rdar://problem/7031922>

• jit/ExecutableAllocatorPosix.cpp:

(JSC::ExecutablePool::systemAlloc):

• jit/ExecutableAllocatorWin.cpp:

(JSC::ExecutablePool::systemAlloc):

Location:

trunk/JavaScriptCore/jit

Files:

• ExecutableAllocatorPosix.cpp (modified) (1 diff)
• ExecutableAllocatorWin.cpp (modified) (1 diff)

trunk/JavaScriptCore/jit/ExecutableAllocatorPosix.cpp

@@ -45 +45 @@
 ExecutablePool::Allocation ExecutablePool::systemAlloc(size_t n)
 {
-    ExecutablePool::Allocation alloc = { reinterpret_cast<char*>(mmap(NULL, n, INITIAL_PROTECTION_FLAGS, MAP_PRIVATE | MAP_ANON, VM_TAG_FOR_EXECUTABLEALLOCATOR_MEMORY, 0)), n };
+    void* allocation = mmap(NULL, n, INITIAL_PROTECTION_FLAGS, MAP_PRIVATE | MAP_ANON, VM_TAG_FOR_EXECUTABLEALLOCATOR_MEMORY, 0);
+    if (allocation == MAP_FAILED)
+        CRASH();
+    ExecutablePool::Allocation alloc = { reinterpret_cast<char*>(allocation), n };
     return alloc;
 }

trunk/JavaScriptCore/jit/ExecutableAllocatorWin.cpp

@@ -43 +43 @@
 ExecutablePool::Allocation ExecutablePool::systemAlloc(size_t n)
 {
-    ExecutablePool::Allocation alloc = {reinterpret_cast<char*>(VirtualAlloc(0, n, MEM_COMMIT | MEM_RESERVE, PAGE_EXECUTE_READWRITE)), n};
+    void* allocation = VirtualAlloc(0, n, MEM_COMMIT | MEM_RESERVE, PAGE_EXECUTE_READWRITE);
+    if (!allocation)
+        CRASH();
+    ExecutablePool::Allocation alloc = {reinterpret_cast<char*>(allocation), n};
     return alloc;
 }