mainnika/weston
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

compositor-wayland: Destroy cursor images earlier

Browse Source 
Destroying a wl_cursor will attempt to access the wl_display, which
we have just freed. Avoid a segfault by destroying the cursor images
before we destroy the display.

Signed-off-by: Daniel Stone <daniels@collabora.com>
Reviewed-by: Peter Hutterer <peter.hutterer@who-t.net>
Reviewed-by: Dima Ryazanov <dima@gmail.com>
This commit is contained in:
Daniel Stone
2016-11-24 15:31:33 +00:00
parent 7dbb0e148f
commit 698f9bf854
1 changed files with 4 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files
libweston/compositor-wayland.c
+4 -4
View File
@@ -2372,10 +2372,6 @@ wayland_destroy(struct weston_compositor *ec)
if (b->parent.compositor) if (b->parent.compositor)
wl_compositor_destroy(b->parent.compositor); wl_compositor_destroy(b->parent.compositor);
wl_registry_destroy(b->parent.registry);
wl_display_flush(b->parent.wl_display);
wl_display_disconnect(b->parent.wl_display);
if (b->theme) if (b->theme)
theme_destroy(b->theme); theme_destroy(b->theme);
@@ -2384,6 +2380,10 @@ wayland_destroy(struct weston_compositor *ec)
wl_cursor_theme_destroy(b->cursor_theme); wl_cursor_theme_destroy(b->cursor_theme);
wl_registry_destroy(b->parent.registry);
wl_display_flush(b->parent.wl_display);
wl_display_disconnect(b->parent.wl_display);
free(b); free(b);
} }