diff options
author | Yariv Barkan <nushoin@users.noreply.github.com> | 2019-12-18 23:03:19 +0200 |
---|---|---|
committer | Yariv Barkan <nushoin@users.noreply.github.com> | 2019-12-18 23:03:19 +0200 |
commit | 0604924c20f0174203ba0674e7a56f2cd7b91b10 (patch) | |
tree | 8f66747f4d5b7ba3c77c0d3a99f9752a353701cd /gtk/gtkgesturerotate.c | |
parent | 0f2281e26779ce2c34dfd80a1f0cf7b74fce8a65 (diff) | |
download | gtk+-0604924c20f0174203ba0674e7a56f2cd7b91b10.tar.gz |
gtkgesturerotate: Fix a memory leak
On touchpads gtk_gesture_get_sequences() was called without a
corresponding g_list_free(). The same was true for touchscreens
if due to some reason only a single sequence was found.
Diffstat (limited to 'gtk/gtkgesturerotate.c')
-rw-r--r-- | gtk/gtkgesturerotate.c | 17 |
1 files changed, 10 insertions, 7 deletions
diff --git a/gtk/gtkgesturerotate.c b/gtk/gtkgesturerotate.c index 687589e571..07bf8157f9 100644 --- a/gtk/gtkgesturerotate.c +++ b/gtk/gtkgesturerotate.c @@ -82,21 +82,21 @@ _gtk_gesture_rotate_get_angle (GtkGestureRotate *rotate, gdouble x1, y1, x2, y2; GtkGesture *gesture; gdouble dx, dy; - GList *sequences; + GList *sequences = NULL; GdkTouchpadGesturePhase phase; + gboolean retval = FALSE; gesture = GTK_GESTURE (rotate); priv = gtk_gesture_rotate_get_instance_private (rotate); if (!gtk_gesture_is_recognized (gesture)) - return FALSE; + goto out; sequences = gtk_gesture_get_sequences (gesture); if (!sequences) - return FALSE; + goto out; last_event = gtk_gesture_get_last_event (gesture, sequences->data); - gdk_event_get_touchpad_gesture_phase (last_event, &phase); if (gdk_event_get_event_type (last_event) == GDK_TOUCHPAD_PINCH && @@ -109,11 +109,10 @@ _gtk_gesture_rotate_get_angle (GtkGestureRotate *rotate, else { if (!sequences->next) - return FALSE; + goto out; gtk_gesture_get_point (gesture, sequences->data, &x1, &y1); gtk_gesture_get_point (gesture, sequences->next->data, &x2, &y2); - g_list_free (sequences); dx = x1 - x2; dy = y1 - y2; @@ -127,7 +126,11 @@ _gtk_gesture_rotate_get_angle (GtkGestureRotate *rotate, *angle = fmod (*angle, 2 * G_PI); } - return TRUE; + retval = TRUE; + + out: + g_list_free (sequences); + return retval; } static gboolean |