Title: [186429] releases/WebKitGTK/webkit-2.8/Source/WebKit2
- Revision
- 186429
- Author
- [email protected]
- Date
- 2015-07-07 02:44:58 -0700 (Tue, 07 Jul 2015)
Log Message
Merge r185896 - [GTK] Crash performing drag-and-drop
https://bugs.webkit.org/show_bug.cgi?id=146267
Reviewed by Darin Adler.
Return early if gtk_get_current_event() returns null to avoid a crash. Note that this does
not fix drag-and-drop. Note also this prevents the web process from forcing the UI process
to crash by sending fake startDrag messages.
* UIProcess/gtk/DragAndDropHandler.cpp:
(WebKit::DragAndDropHandler::startDrag):
Modified Paths
Diff
Modified: releases/WebKitGTK/webkit-2.8/Source/WebKit2/ChangeLog (186428 => 186429)
--- releases/WebKitGTK/webkit-2.8/Source/WebKit2/ChangeLog 2015-07-07 09:43:05 UTC (rev 186428)
+++ releases/WebKitGTK/webkit-2.8/Source/WebKit2/ChangeLog 2015-07-07 09:44:58 UTC (rev 186429)
@@ -1,3 +1,17 @@
+2015-06-23 Michael Catanzaro <[email protected]>
+
+ [GTK] Crash performing drag-and-drop
+ https://bugs.webkit.org/show_bug.cgi?id=146267
+
+ Reviewed by Darin Adler.
+
+ Return early if gtk_get_current_event() returns null to avoid a crash. Note that this does
+ not fix drag-and-drop. Note also this prevents the web process from forcing the UI process
+ to crash by sending fake startDrag messages.
+
+ * UIProcess/gtk/DragAndDropHandler.cpp:
+ (WebKit::DragAndDropHandler::startDrag):
+
2015-06-22 Gyuyoung Kim <[email protected]>
[EFL][CustomProtocol] Do not add duplicated custom scheme
Modified: releases/WebKitGTK/webkit-2.8/Source/WebKit2/UIProcess/gtk/DragAndDropHandler.cpp (186428 => 186429)
--- releases/WebKitGTK/webkit-2.8/Source/WebKit2/UIProcess/gtk/DragAndDropHandler.cpp 2015-07-07 09:43:05 UTC (rev 186428)
+++ releases/WebKitGTK/webkit-2.8/Source/WebKit2/UIProcess/gtk/DragAndDropHandler.cpp 2015-07-07 09:44:58 UTC (rev 186429)
@@ -114,6 +114,9 @@
GRefPtr<GtkTargetList> targetList = adoptGRef(PasteboardHelper::defaultPasteboardHelper()->targetListForDataObject(dataObject.get()));
GUniquePtr<GdkEvent> currentEvent(gtk_get_current_event());
+ if (!currentEvent)
+ return;
+
GdkDragContext* context = gtk_drag_begin(m_page.viewWidget(), targetList.get(), dragOperationToGdkDragActions(dragData.draggingSourceOperationMask()),
GDK_BUTTON_PRIMARY, currentEvent.get());
m_draggingDataObjects.set(context, dataObject.get());
_______________________________________________
webkit-changes mailing list
[email protected]
https://lists.webkit.org/mailman/listinfo/webkit-changes
