Lerking/gtk
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge branch 'fix-possible-segfault' into 'gtk-3-24'

Browse Source 
dnd: Prevent a possible segfault

See merge request GNOME/gtk!6957
This commit is contained in:
Matthias Clasen
2024-02-28 18:52:53 +00:00
parent 687ec22393 889057a386
commit bb99970746
1 changed files with 2 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
gtk/gtkentry.c
View File

@@ -4724,7 +4724,7 @@ gtk_entry_drag_gesture_update (GtkGestureDrag *gesture,
button = gtk_gesture_single_get_current_button (GTK_GESTURE_SINGLE (gesture));
gtk_drag_begin_with_coordinates (widget, target_list, actions,
button, (GdkEvent*) event,
priv->drag_start_x + ranges[0],
priv->drag_start_x + (n_ranges > 0 ? ranges[0] : 0),
priv->drag_start_y);
g_free (ranges);
@@ -9931,7 +9931,7 @@ gtk_entry_drag_begin (GtkWidget *widget,
gtk_entry_get_pixel_ranges (entry, &ranges, &n_ranges);
cairo_surface_get_device_scale (surface, &sx, &sy);
cairo_surface_set_device_offset (surface,
-(priv->drag_start_x - ranges[0]) * sx,
-(priv->drag_start_x - (n_ranges > 0 ? ranges[0] : 0)) * sx,
-(priv->drag_start_y) * sy);
g_free (ranges);