Changeset 241659 in webkit

Timestamp:

Feb 18, 2019 1:12:48 AM (5 years ago)

Author:

Carlos Garcia Campos

Message:

[GTK] Crash while filling selection data during drag and drop
​https://bugs.webkit.org/show_bug.cgi?id=194698

Reviewed by Michael Catanzaro.

I can't reproduce this, but it seems that m_draggingSelectionData is nullptr in fillDragData(). That can happen
when startDrag cancels a previous DND operation, because the new m_draggingSelectionData is set before the
current DND operation is cancelled, which sets it to nullptr.

• UIProcess/gtk/DragAndDropHandler.cpp:

(WebKit::DragAndDropHandler::startDrag): Finish the previous operation before setting m_draggingSelectionData.

Location:

trunk/Source/WebKit

Files:

• ChangeLog (modified) (1 diff)
• UIProcess/gtk/DragAndDropHandler.cpp (modified) (2 diffs)

trunk/Source/WebKit/ChangeLog

@@ +1 @@
+2019-02-18  Carlos Garcia Campos  <cgarcia@igalia.com>
+
+        [GTK] Crash while filling selection data during drag and drop
+        https://bugs.webkit.org/show_bug.cgi?id=194698
+
+        Reviewed by Michael Catanzaro.
+
+        I can't reproduce this, but it seems that m_draggingSelectionData is nullptr in fillDragData(). That can happen
+        when startDrag cancels a previous DND operation, because the new m_draggingSelectionData is set before the
+        current DND operation is cancelled, which sets it to nullptr.
+
+        * UIProcess/gtk/DragAndDropHandler.cpp:
+        (WebKit::DragAndDropHandler::startDrag): Finish the previous operation before setting m_draggingSelectionData.
+
 2019-02-17  Youenn Fablet  <youenn@apple.com>
 

trunk/Source/WebKit/UIProcess/gtk/DragAndDropHandler.cpp

@@ -108 +108 @@
 {
 #if GTK_CHECK_VERSION(3, 16, 0)
+    // WebCore::EventHandler does not support more than one DnD operation at the same time for
+    // a given page, so we should cancel any previous operation whose context we might have
+    // stored, should we receive a new startDrag event before finishing a previous DnD operation.
+    if (m_dragContext) {
+        gtk_drag_cancel(m_dragContext.get());
+        m_dragContext = nullptr;
+    }
+
     m_draggingSelectionData = WTFMove(selection);
     GRefPtr<GtkTargetList> targetList = PasteboardHelper::singleton().targetListForSelectionData(*m_draggingSelectionData);
@@ -120 +128 @@
 
 #if GTK_CHECK_VERSION(3, 16, 0)
-    // WebCore::EventHandler does not support more than one DnD operation at the same time for
-    // a given page, so we should cancel any previous operation whose context we might have
-    // stored, should we receive a new startDrag event before finishing a previous DnD operation.
-    if (m_dragContext)
-        gtk_drag_cancel(m_dragContext.get());
     m_dragContext = context;
 #else