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

mi: don't crash on miPointerGetPosition for disabled devices 

If a device is disabled, its master device is forcibly reset to NULL but
unlike a floating device it doesn't have a sprite allocated. Calling
miPointerGetPosition for a disabled device thus crashes.

Avoid this by returning 0/0 for any device without a miPointer.
This is a quick fix only, a proper fix for this issue is rather more
involved.

Closes #1782

Part-of: <https://gitlab.freedesktop.org/xorg/xserver/-/merge_requests/1771>
This commit is contained in:
Peter Hutterer 2025-02-07 18:14:55 +10:00 committed by Marge Bot
parent 05e54fefaf
commit acbdd0ecdd
1 changed files with 9 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
mi/mipointer.c
View File

@ -726,8 +726,15 @@ miPointerSetPosition(DeviceIntPtr pDev, int mode, double *screenx,
void void
miPointerGetPosition(DeviceIntPtr pDev, int *x, int *y) miPointerGetPosition(DeviceIntPtr pDev, int *x, int *y)
{ {
*x = MIPOINTER(pDev)->x; miPointerPtr pPointer = MIPOINTER(pDev);
*y = MIPOINTER(pDev)->y; if (pPointer) {
*x = pPointer->x;
*y = pPointer->y;
}
else {
*x = 0;
*y = 0;
}
} }
/** /**