andreacavalli/xserver-multidpi
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

animcur: Fix crash when removing a master device

Browse Source 
Reproducer:

$ Xvfb -ac -noreset :1 &
$ DISPLAY=:1 xinput create-master touch1
$ DISPLAY=:1 xinput remove-master "touch1 pointer"

Bugzilla: https://bugs.freedesktop.org/105761
Signed-off-by: Adam Jackson <ajax@redhat.com>
Reviewed-by: Peter Hutterer <peter.hutterer@who-t.net>
This commit is contained in:
Adam Jackson 2018-04-23 15:21:14 -04:00
parent 8275903956
commit 9d5af632fd
1 changed files with 2 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
render/animcur.c
View File

@ -155,7 +155,8 @@ AnimCurTimerNotify(OsTimerPtr timer, CARD32 now, void *arg)
static void static void
AnimCurCancelTimer(DeviceIntPtr pDev) AnimCurCancelTimer(DeviceIntPtr pDev)
{ {
CursorPtr cur = pDev->spriteInfo->sprite->current; CursorPtr cur = pDev->spriteInfo->sprite ?
pDev->spriteInfo->sprite->current : NULL;
if (IsAnimCur(cur)) if (IsAnimCur(cur))
TimerCancel(GetAnimCur(cur)->timer); TimerCancel(GetAnimCur(cur)->timer);