AuroraMiddleware/gtk
1
0
Fork 1
mirror of https://gitlab.gnome.org/GNOME/gtk.git synced 2024-11-11 03:10:09 +00:00
Code Issues Projects Releases Wiki Activity

wayland: Avoid segfault when cursors are freed

Browse Source 
The check for GDK_CURSOR_IS_PIXMAP was ineffective, since _all_
cursors have this type, from the looks of it. Instead, store
buffer ownership information separately.
This commit is contained in:
Matthias Clasen 2013-03-22 19:09:20 -04:00
parent cc70ac104d
commit 37843faea9
1 changed files with 4 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
gdk/wayland/gdkcursor-wayland.c
View File

@ -54,6 +54,7 @@ struct _GdkWaylandCursor
int hotspot_x, hotspot_y;
int width, height;
struct wl_buffer *buffer;
gboolean free_buffer;
};
struct _GdkWaylandCursorClass
@ -133,7 +134,7 @@ gdk_wayland_cursor_finalize (GObject *object)
GdkWaylandCursor *cursor = GDK_WAYLAND_CURSOR (object);
g_free (cursor->name);
if (cursor->cursor.type == GDK_CURSOR_IS_PIXMAP)
if (cursor->free_buffer)
wl_buffer_destroy (cursor->buffer);
G_OBJECT_CLASS (_gdk_wayland_cursor_parent_class)->finalize (object);
@ -311,6 +312,7 @@ _gdk_wayland_display_get_cursor_for_name (GdkDisplay *display,
private->height = cursor->images[0]->height;
private->buffer = wl_cursor_image_get_buffer(cursor->images[0]);
private->free_buffer = FALSE;
add_to_cache (wayland_display, private);
@ -372,6 +374,7 @@ _gdk_wayland_display_get_cursor_for_pixbuf (GdkDisplay *display,
cursor->height,
stride,
WL_SHM_FORMAT_ARGB8888);
cursor->free_buffer = FALSE;
wl_shm_pool_destroy (pool);