callisto-debian/gtk3
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

gesture: Prevent against sequence cancellation within gtk_gesture_set_state()

Browse Source 
Sequences may be cancelled within the ::sequence-state-changed handler, which
would change the points hashtable as it's being iterated in this function. So
iterate over a list of sequences and let the hashtable change freely.
This commit is contained in:
Carlos Garnacho
2014-05-07 11:18:00 +02:00
parent 44a960199b
commit 2a0bf33bc9
1 changed files with 6 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

11
gtk/gtkgesture.c
View File

@ -845,20 +845,21 @@ gboolean
gtk_gesture_set_state (GtkGesture *gesture, gtk_gesture_set_state (GtkGesture *gesture,
GtkEventSequenceState state) GtkEventSequenceState state)
{ {
GdkEventSequence *sequence;
gboolean handled = FALSE; gboolean handled = FALSE;
GtkGesturePrivate *priv; GtkGesturePrivate *priv;
GHashTableIter iter; GList *sequences, *l;
g_return_val_if_fail (GTK_IS_GESTURE (gesture), FALSE); g_return_val_if_fail (GTK_IS_GESTURE (gesture), FALSE);
g_return_val_if_fail (state >= GTK_EVENT_SEQUENCE_NONE && g_return_val_if_fail (state >= GTK_EVENT_SEQUENCE_NONE &&
state <= GTK_EVENT_SEQUENCE_DENIED, FALSE); state <= GTK_EVENT_SEQUENCE_DENIED, FALSE);
priv = gtk_gesture_get_instance_private (gesture); priv = gtk_gesture_get_instance_private (gesture);
g_hash_table_iter_init (&iter, priv->points); sequences = g_hash_table_get_keys (priv->points);
while (g_hash_table_iter_next (&iter, (gpointer*) &sequence, NULL)) for (l = sequences; l; l = l->next)
handled |= gtk_gesture_set_sequence_state (gesture, sequence, state); handled |= gtk_gesture_set_sequence_state (gesture, l->data, state);
g_list_free (sequences);
return handled; return handled;
} }