diff options
| author | Peter Hutterer <peter.hutterer@who-t.net> | 2009-07-03 09:52:04 +1000 |
|---|---|---|
| committer | Peter Hutterer <peter.hutterer@who-t.net> | 2009-07-03 09:56:37 +1000 |
| commit | 97e29ffb5bf04a9d8280f1fa32ceced148503492 (patch) | |
| tree | 7bf48e4d5ac84f31a1c102fcd36b8ce249bfa12b | |
| parent | 50a2a8dc76645d8736f7d712f0ef05f23089407e (diff) | |
xfree86: fix wrong IsMaster() check causing crashes.
Crashes caused by dereferencing NULL if the path was executed for a floating
slave device.
Signed-off-by: Peter Hutterer <peter.hutterer@who-t.net>
| -rw-r--r-- | hw/xfree86/ramdac/xf86Cursor.c | 3 |
1 files changed, 1 insertions, 2 deletions
diff --git a/hw/xfree86/ramdac/xf86Cursor.c b/hw/xfree86/ramdac/xf86Cursor.c index b474ff318..6b71f4677 100644 --- a/hw/xfree86/ramdac/xf86Cursor.c +++ b/hw/xfree86/ramdac/xf86Cursor.c @@ -303,8 +303,7 @@ xf86CursorSetCursor(DeviceIntPtr pDev, ScreenPtr pScreen, CursorPtr pCurs, if (pCurs == NullCursor) { /* means we're supposed to remove the cursor */ if (ScreenPriv->SWCursor || - !(pDev == inputInfo.pointer || !IsMaster(pDev) && - GetMaster(pDev->u.master, MASTER_POINTER) == inputInfo.pointer)) + !(GetMaster(pDev, MASTER_POINTER) == inputInfo.pointer)) (*ScreenPriv->spriteFuncs->SetCursor)(pDev, pScreen, NullCursor, x, y); else if (ScreenPriv->isUp) { xf86SetCursor(pScreen, NullCursor, x, y); |