Title: [181788] releases/WebKitGTK/webkit-2.8/Source/WebCore
Revision
181788
Author
carlo...@webkit.org
Date
2015-03-20 01:07:39 -0700 (Fri, 20 Mar 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.8/Source/WebCore/ChangeLog (181787 => 181788)


--- releases/WebKitGTK/webkit-2.8/Source/WebCore/ChangeLog	2015-03-20 08:04:37 UTC (rev 181787)
+++ releases/WebKitGTK/webkit-2.8/Source/WebCore/ChangeLog	2015-03-20 08:07:39 UTC (rev 181788)
@@ -1,3 +1,17 @@
+2015-03-20  Carlos Garcia Campos  <cgar...@igalia.com>
+
+        [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-19  Carlos Garcia Campos  <cgar...@igalia.com>
 
         [GTK] Scrollbars look bad with GTK+ 3.16

Modified: releases/WebKitGTK/webkit-2.8/Source/WebCore/platform/graphics/cairo/ImageBufferCairo.cpp (181787 => 181788)


--- releases/WebKitGTK/webkit-2.8/Source/WebCore/platform/graphics/cairo/ImageBufferCairo.cpp	2015-03-20 08:04:37 UTC (rev 181787)
+++ releases/WebKitGTK/webkit-2.8/Source/WebCore/platform/graphics/cairo/ImageBufferCairo.cpp	2015-03-20 08:07:39 UTC (rev 181788)
@@ -101,6 +101,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
webkit-changes@lists.webkit.org
https://lists.webkit.org/mailman/listinfo/webkit-changes

Reply via email to