Changeset 285976 in webkit

Timestamp:

Nov 17, 2021, 7:54:56 PM (5 years ago)

Author:

Cameron McCormack

Message:

Protect against null SharedBitmaps when starting a drag
​https://bugs.webkit.org/show_bug.cgi?id=233217
<rdar://problem/85478309>

Reviewed by Wenson Hsieh.

• UIProcess/ios/PageClientImplIOS.mm:

(WebKit::PageClientImpl::startDrag):

Location:

trunk/Source/WebKit

Files:

• ChangeLog (modified) (1 diff)
• UIProcess/ios/PageClientImplIOS.mm (modified) (1 diff)

trunk/Source/WebKit/ChangeLog

@@ +1 @@
+2021-11-17  Cameron McCormack  <heycam@apple.com>
+
+        Protect against null SharedBitmaps when starting a drag
+        https://bugs.webkit.org/show_bug.cgi?id=233217
+        <rdar://problem/85478309>
+
+        Reviewed by Wenson Hsieh.
+
+        * UIProcess/ios/PageClientImplIOS.mm:
+        (WebKit::PageClientImpl::startDrag):
+
 2021-11-17  Wenson Hsieh  <wenson_hsieh@apple.com>
 

trunk/Source/WebKit/UIProcess/ios/PageClientImplIOS.mm

@@ -911 +911 @@
 void PageClientImpl::startDrag(const DragItem& item, const ShareableBitmap::Handle& image)
 {
-    [m_contentView _startDrag:ShareableBitmap::create(image)->makeCGImageCopy() item:item];
+    auto bitmap = ShareableBitmap::create(image);
+    if (!bitmap)
+        return;
+    [m_contentView _startDrag:bitmap->makeCGImageCopy() item:item];
 }