XLibre/xserver
1
1
Fork 0
mirror of https://github.com/X11Libre/xserver.git synced 2026-03-24 08:04:30 +00:00
Code Issues Packages Projects Releases Wiki Activity

dix: protect from pScreen->SetCursorPosition == NULL

Browse Source 
It's safer not relying on all ScreenProc's actually filled.

../dix/events.c: In function ‘CheckPhysLimits’:
../dix/events.c:780:14: warning: dereference of NULL ‘pScreen’ [CWE-476] [-Wanalyzer-null-dereference]
  780 |             (*pScreen->SetCursorPosition)
      |             ~^~~~~~~~~~~~~~~~~~~~~~~~~~~~

Signed-off-by: Enrico Weigelt, metux IT consult <info@metux.net>
This commit is contained in:
Enrico Weigelt, metux IT consult
2025-05-06 14:44:13 +02:00
parent 654c9c1f3d
commit f1ba454733
4 changed files with 12 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
hw/xfree86/common/xf86RandR.c
View File

@@ -330,7 +330,8 @@ xf86RandRSetConfig(ScreenPtr pScreen,
view_adjusted = TRUE;
}
(*pScreen->SetCursorPosition) (dev, pScreen, px, py, FALSE);
if (pScreen->SetCursorPosition)
pScreen->SetCursorPosition(dev, pScreen, px, py, FALSE);
}
}

4
hw/xfree86/dri/dri.c
View File

@@ -2393,7 +2393,9 @@ DRIAdjustFrame(ScrnInfoPtr pScrn, int x, int y)
py = pScrn->frameY0;
if (py > pScrn->frameY1)
py = pScrn->frameY1;
pScreen->SetCursorPosition(inputInfo.pointer, pScreen, px, py, TRUE);
if (pScreen->SetCursorPosition)
pScreen->SetCursorPosition(inputInfo.pointer, pScreen, px, py, TRUE);
return;
}