Title: [154433] trunk/Source/WebKit2
- Revision
- 154433
- Author
- [email protected]
- Date
- 2013-08-21 18:00:06 -0700 (Wed, 21 Aug 2013)
Log Message
Another null-deref under WebDragClient::startDrag
https://bugs.webkit.org/show_bug.cgi?id=120145
<rdar://problem/14650652>
Reviewed by Simon Fraser.
convertImageToBitmap can legitimately return null, so don't dereference it.
* WebProcess/WebCoreSupport/mac/WebDragClientMac.mm:
(WebKit::WebDragClient::startDrag):
Modified Paths
Diff
Modified: trunk/Source/WebKit2/ChangeLog (154432 => 154433)
--- trunk/Source/WebKit2/ChangeLog 2013-08-22 00:58:44 UTC (rev 154432)
+++ trunk/Source/WebKit2/ChangeLog 2013-08-22 01:00:06 UTC (rev 154433)
@@ -1,3 +1,16 @@
+2013-08-21 Tim Horton <[email protected]>
+
+ Another null-deref under WebDragClient::startDrag
+ https://bugs.webkit.org/show_bug.cgi?id=120145
+ <rdar://problem/14650652>
+
+ Reviewed by Simon Fraser.
+
+ convertImageToBitmap can legitimately return null, so don't dereference it.
+
+ * WebProcess/WebCoreSupport/mac/WebDragClientMac.mm:
+ (WebKit::WebDragClient::startDrag):
+
2013-08-21 Beth Dakin <[email protected]>
<https://webkit.org/b/120140> Clients expect didFirstLayout-related calls to
Modified: trunk/Source/WebKit2/WebProcess/WebCoreSupport/mac/WebDragClientMac.mm (154432 => 154433)
--- trunk/Source/WebKit2/WebProcess/WebCoreSupport/mac/WebDragClientMac.mm 2013-08-22 00:58:44 UTC (rev 154432)
+++ trunk/Source/WebKit2/WebProcess/WebCoreSupport/mac/WebDragClientMac.mm 2013-08-22 01:00:06 UTC (rev 154433)
@@ -82,7 +82,7 @@
bitmapSize.scale(frame->page()->deviceScaleFactor());
RefPtr<ShareableBitmap> bitmap = convertImageToBitmap(image.get(), bitmapSize);
ShareableBitmap::Handle handle;
- if (!bitmap->createHandle(handle))
+ if (!bitmap || !bitmap->createHandle(handle))
return;
// FIXME: Seems this message should be named StartDrag, not SetDragImage.
_______________________________________________
webkit-changes mailing list
[email protected]
https://lists.webkit.org/mailman/listinfo/webkit-changes
