From 9d5af632fde0373babfa32e66a59cfbf26ed7e5d Mon Sep 17 00:00:00 2001
From: Adam Jackson <ajax@redhat.com>
Date: Mon, 23 Apr 2018 15:21:14 -0400
Subject: [PATCH] animcur: Fix crash when removing a master device

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>
---
 render/animcur.c | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/render/animcur.c b/render/animcur.c
index 65327df65..ef27bda27 100644
--- a/render/animcur.c
+++ b/render/animcur.c
@@ -155,7 +155,8 @@ AnimCurTimerNotify(OsTimerPtr timer, CARD32 now, void *arg)
 static void
 AnimCurCancelTimer(DeviceIntPtr pDev)
 {
-    CursorPtr cur = pDev->spriteInfo->sprite->current;
+    CursorPtr cur = pDev->spriteInfo->sprite ?
+                    pDev->spriteInfo->sprite->current : NULL;
 
     if (IsAnimCur(cur))
         TimerCancel(GetAnimCur(cur)->timer);