XLibre/xserver
1
1
Fork 0
mirror of https://github.com/X11Libre/xserver.git synced 2026-04-14 17:18:09 +00:00
Code Issues Packages Projects Releases Wiki Activity

xfree86: xf86helper: fix NULL dereference

Browse Source 
xf86MatchDevice() can segfault if screensecptr->device is NULL.

Issue: https://gitlab.freedesktop.org/xorg/xserver/-/issues/1767
Signed-off-by: Enrico Weigelt, metux IT consult <info@metux.net>
Part-of: <https://gitlab.freedesktop.org/xorg/xserver/-/merge_requests/1847>
(cherry picked from commit fe9c911e22)
This commit is contained in:
Enrico Weigelt, metux IT consult
2025-02-28 14:41:12 +01:00
committed by Alan Coopersmith
parent 29b11b39ab
commit ffd7446d4d
1 changed files with 2 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -1321,7 +1321,8 @@ xf86MatchDevice(const char *drivername, GDevPtr ** sectlist)
*/
for (j = 0; xf86ConfigLayout.screens[j].screen != NULL; j++) {
screensecptr = xf86ConfigLayout.screens[j].screen;
if ((screensecptr->device->driver != NULL)
if ((screensecptr->device != NULL)
&& (screensecptr->device->driver != NULL)
&& (xf86NameCmp(screensecptr->device->driver, drivername) == 0)
&& (!screensecptr->device->claimed)) {
/*