xserver: Branch 'master'

[GitLab Mirror]

 hw/xfree86/common/xf86Helper.c |    3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

New commits:
commit fe9c911e22cb0b24e01a8183af1634149675261d
Author: Enrico Weigelt, metux IT consult <info at metux.net>
Date:   Fri Feb 28 14:41:12 2025 +0100

    xfree86: xf86helper: fix NULL dereference
    
    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 at metux.net>
    Part-of: <https://gitlab.freedesktop.org/xorg/xserver/-/merge_requests/1847>

diff --git a/hw/xfree86/common/xf86Helper.c b/hw/xfree86/common/xf86Helper.c
index cb4a60f87..cbebd5461 100644
--- a/hw/xfree86/common/xf86Helper.c
+++ b/hw/xfree86/common/xf86Helper.c
@@ -1304,7 +1304,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)) {
             /*