frederik
/
xserver
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

modesetting: handle NULL cursor in drmmode_set_cursor. 

We had a bug reported with a touchscreen where we could end up
in here with a NULL cursor, so let's not crash the X server.

Signed-off-by: Dave Airlie <airlied@redhat.com>
Reviewed-and-Tested-by: Daniel Martin <consume.noise@gmail.com>
Signed-off-by: Peter Hutterer <peter.hutterer@who-t.net>
This commit is contained in:
Dave Airlie 2017-06-23 09:29:13 +10:00 committed by Peter Hutterer
parent 43527d3181
commit ce393de0ef
1 changed files with 3 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
hw/xfree86/drivers/modesetting/drmmode_display.c
View File

@ -759,6 +759,9 @@ drmmode_set_cursor(xf86CrtcPtr crtc)
CursorPtr cursor = xf86CurrentCursor(crtc->scrn->pScreen); CursorPtr cursor = xf86CurrentCursor(crtc->scrn->pScreen);
int ret = -EINVAL; int ret = -EINVAL;
if (cursor == NullCursor)
return TRUE;
ret = drmModeSetCursor2(drmmode->fd, drmmode_crtc->mode_crtc->crtc_id, ret = drmModeSetCursor2(drmmode->fd, drmmode_crtc->mode_crtc->crtc_id,
handle, ms->cursor_width, ms->cursor_height, handle, ms->cursor_width, ms->cursor_height,
cursor->bits->xhot, cursor->bits->yhot); cursor->bits->xhot, cursor->bits->yhot);