Changeset 85364 in webkit

Timestamp:

Apr 29, 2011 4:12:44 PM (13 years ago)

Author:

weinig@apple.com

Message:

2011-04-29 Sam Weinig <​sam@webkit.org>

Reviewed by Dan Bernstein.

Add protection for shared memory failing to allocate
<rdar://problem/9125287>
​https://bugs.webkit.org/show_bug.cgi?id=59842

• Platform/mac/SharedMemoryMac.cpp: (WebKit::SharedMemory::create): Add logging in shared memory failure cases.

• WebProcess/WebPage/DrawingAreaImpl.cpp: (WebKit::DrawingAreaImpl::display): Guard against ShareableBitmap failing to create a shared memory backing.

Location:

trunk/Source/WebKit2

Files:

• ChangeLog (modified) (1 diff)
• Platform/mac/SharedMemoryMac.cpp (modified) (2 diffs)
• WebProcess/WebPage/DrawingAreaImpl.cpp (modified) (1 diff)

trunk/Source/WebKit2/ChangeLog

@@ +1 @@
+2011-04-29  Sam Weinig  <sam@webkit.org>
+
+        Reviewed by Dan Bernstein.
+
+        Add protection for shared memory failing to allocate
+        <rdar://problem/9125287>
+        https://bugs.webkit.org/show_bug.cgi?id=59842
+
+        * Platform/mac/SharedMemoryMac.cpp:
+        (WebKit::SharedMemory::create):
+        Add logging in shared memory failure cases.
+
+        * WebProcess/WebPage/DrawingAreaImpl.cpp:
+        (WebKit::DrawingAreaImpl::display):
+        Guard against ShareableBitmap failing to create a shared memory
+        backing.
+
 2011-04-28  Stephanie Lewis  <slewis@apple.com>
 

trunk/Source/WebKit2/Platform/mac/SharedMemoryMac.cpp

@@ -96 +96 @@
     mach_vm_address_t address;
     kern_return_t kr = mach_vm_allocate(mach_task_self(), &address, round_page(size), VM_FLAGS_ANYWHERE);
-    if (kr != KERN_SUCCESS)
-        return 0;
+    if (kr != KERN_SUCCESS) {
+        LOG_ERROR("Failed to allocate mach_vm_allocate shared memory (%zu bytes) [error code: %x]", size, kr); 
+        return 0;
+    }
 
     // Create a Mach port that represents the shared memory.
@@ -105 +107 @@
 
     if (kr != KERN_SUCCESS) {
+        LOG_ERROR("Failed to create a mach port for shared memory [error code: %x]", kr);
         mach_vm_deallocate(mach_task_self(), address, round_page(size));
         return 0;

trunk/Source/WebKit2/WebProcess/WebPage/DrawingAreaImpl.cpp

@@ -572 +572 @@
 
         RefPtr<ShareableBitmap> bitmap = ShareableBitmap::createShareable(bounds.size(), ShareableBitmap::SupportsAlpha);
+        if (!bitmap)
+            return;
+
         if (!bitmap->createHandle(updateInfo.bitmapHandle))
             return;