xserver: Branch 'master'

[Adam Jackson]

 render/animcur.c |    3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

New commits:
commit 9d5af632fde0373babfa32e66a59cfbf26ed7e5d
Author: Adam Jackson <ajax at redhat.com>
Date:   Mon Apr 23 15:21:14 2018 -0400

    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 at redhat.com>
    Reviewed-by: Peter Hutterer <peter.hutterer at who-t.net>

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);