Title: [184463] releases/WebKitGTK/webkit-2.4/Source/WebCore
- Revision
- 184463
- Author
- [email protected]
- Date
- 2015-05-18 05:05:46 -0700 (Mon, 18 May 2015)
Log Message
Merge r181787 - [GTK] Crash due to empty drag image during drag-and-drop
https://bugs.webkit.org/show_bug.cgi?id=142671
Reviewed by Philippe Normand.
Return early from ImageBuffer constructor if an empty size is
given. This is a speculative fix for a crash while starting a drag
and drop operation, that I haven't been able to reproduce.
* platform/graphics/cairo/ImageBufferCairo.cpp:
(WebCore::ImageBuffer::ImageBuffer):
Modified Paths
Diff
Modified: releases/WebKitGTK/webkit-2.4/Source/WebCore/ChangeLog (184462 => 184463)
--- releases/WebKitGTK/webkit-2.4/Source/WebCore/ChangeLog 2015-05-18 12:02:56 UTC (rev 184462)
+++ releases/WebKitGTK/webkit-2.4/Source/WebCore/ChangeLog 2015-05-18 12:05:46 UTC (rev 184463)
@@ -1,3 +1,17 @@
+2015-03-20 Carlos Garcia Campos <[email protected]>
+
+ [GTK] Crash due to empty drag image during drag-and-drop
+ https://bugs.webkit.org/show_bug.cgi?id=142671
+
+ Reviewed by Philippe Normand.
+
+ Return early from ImageBuffer constructor if an empty size is
+ given. This is a speculative fix for a crash while starting a drag
+ and drop operation, that I haven't been able to reproduce.
+
+ * platform/graphics/cairo/ImageBufferCairo.cpp:
+ (WebCore::ImageBuffer::ImageBuffer):
+
2015-03-05 Carlos Garcia Campos <[email protected]>
[SOUP] Check TLS errors as soon as they are set in the SoupMessage
Modified: releases/WebKitGTK/webkit-2.4/Source/WebCore/platform/graphics/cairo/ImageBufferCairo.cpp (184462 => 184463)
--- releases/WebKitGTK/webkit-2.4/Source/WebCore/platform/graphics/cairo/ImageBufferCairo.cpp 2015-05-18 12:02:56 UTC (rev 184462)
+++ releases/WebKitGTK/webkit-2.4/Source/WebCore/platform/graphics/cairo/ImageBufferCairo.cpp 2015-05-18 12:05:46 UTC (rev 184463)
@@ -97,6 +97,8 @@
, m_logicalSize(size)
{
success = false; // Make early return mean error.
+ if (m_size.isEmpty())
+ return;
#if ENABLE(ACCELERATED_2D_CANVAS)
if (renderingMode == Accelerated)
_______________________________________________
webkit-changes mailing list
[email protected]
https://lists.webkit.org/mailman/listinfo/webkit-changes
