isa/mutter
1
0
Fork 0
mirror of https://github.com/brl/mutter.git synced 2024-11-29 03:20:46 -05:00
Code Issues Packages Projects Releases Wiki Activity

backends/x11: Only free cursor if it was created successfully

Browse Source 
XcursorLibraryLoadCursor can return 'None' if the current cursor theme
is missing the requested icon. If XFreeCursor is then called on this
cursor, it generates a BadCursor error causing gnome-shell to crash.

Fixes https://gitlab.gnome.org/GNOME/mutter/issues/254

(cherry picked from commit 1bfa20929b)
This commit is contained in:
Sebastian Keller 2018-08-02 00:58:56 +02:00 committed by Ray Strode
parent 4525a74e59
commit bcba6571f0
1 changed files with 3 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
src/core/screen.c
View File

@ -1397,6 +1397,8 @@ meta_screen_update_cursor (MetaScreen *screen)
XDefineCursor (display->xdisplay, screen->xroot, xcursor); XDefineCursor (display->xdisplay, screen->xroot, xcursor);
XFlush (display->xdisplay); XFlush (display->xdisplay);
if (xcursor)
XFreeCursor (display->xdisplay, xcursor); XFreeCursor (display->xdisplay, xcursor);
} }