Title: [154491] branches/safari-537-branch/Source/WebKit2
- Revision
- 154491
- Author
- [email protected]
- Date
- 2013-08-23 09:54:04 -0700 (Fri, 23 Aug 2013)
Log Message
Merged r154433. <rdar://problem/14650652>
Modified Paths
Diff
Modified: branches/safari-537-branch/Source/WebKit2/ChangeLog (154490 => 154491)
--- branches/safari-537-branch/Source/WebKit2/ChangeLog 2013-08-23 16:51:13 UTC (rev 154490)
+++ branches/safari-537-branch/Source/WebKit2/ChangeLog 2013-08-23 16:54:04 UTC (rev 154491)
@@ -1,3 +1,20 @@
+2013-08-23 Lucas Forschler <[email protected]>
+
+ Merge r154433
+
+ 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-20 Lucas Forschler <[email protected]>
Merge r154302
Modified: branches/safari-537-branch/Source/WebKit2/WebProcess/WebCoreSupport/mac/WebDragClientMac.mm (154490 => 154491)
--- branches/safari-537-branch/Source/WebKit2/WebProcess/WebCoreSupport/mac/WebDragClientMac.mm 2013-08-23 16:51:13 UTC (rev 154490)
+++ branches/safari-537-branch/Source/WebKit2/WebProcess/WebCoreSupport/mac/WebDragClientMac.mm 2013-08-23 16:54:04 UTC (rev 154491)
@@ -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
