diff options
| author | Matthias Clasen <mclasen@redhat.com> | 2016-05-11 13:24:04 -0400 |
|---|---|---|
| committer | Rico Tzschichholz <ricotz@ubuntu.com> | 2016-05-17 10:30:44 +0200 |
| commit | e006f3ca98990f6e3c8da58b49d7feba8403bb47 (patch) | |
| tree | 7af38ca723b632736a99c0591d8c9735a176a747 | |
| parent | 4424bf8135d46b8576adc2cce725af33eee64de9 (diff) | |
| download | gtk+-e006f3ca98990f6e3c8da58b49d7feba8403bb47.tar.gz | |
DND: Avoid a use-after-free
Cancelling the gesture causes the last_event pointer to become
invalid. Make a copy of the event so we can keep using it
regardless of the gesture state.
(cherry picked from commit 358eec297204b438809692a24cc3649658dbab5a)
| -rw-r--r-- | gtk/gtkdragsource.c | 10 |
1 files changed, 7 insertions, 3 deletions
diff --git a/gtk/gtkdragsource.c b/gtk/gtkdragsource.c index 4d9aee1e10..d75ef3c97c 100644 --- a/gtk/gtkdragsource.c +++ b/gtk/gtkdragsource.c @@ -84,17 +84,21 @@ gtk_drag_source_event_cb (GtkWidget *widget, start_x + offset_x, start_y + offset_y)) { GdkEventSequence *sequence; - const GdkEvent *last_event; + GdkEvent *last_event; guint button; sequence = gtk_gesture_single_get_current_sequence (GTK_GESTURE_SINGLE (site->drag_gesture)); - last_event = gtk_gesture_get_last_event (site->drag_gesture, sequence); - button = gtk_gesture_single_get_current_button (GTK_GESTURE_SINGLE (site->drag_gesture)); + last_event = gdk_event_copy (gtk_gesture_get_last_event (site->drag_gesture, sequence)); + button = gtk_gesture_single_get_current_button (GTK_GESTURE_SINGLE (site->drag_gesture)); gtk_event_controller_reset (GTK_EVENT_CONTROLLER (site->drag_gesture)); + gtk_drag_begin_internal (widget, site->image_def, site->target_list, site->actions, button, last_event, start_x, start_y); + + gdk_event_free (last_event); + return TRUE; } } |