Don't coredump on "X -showopts" (bug 25874)

Don't try walking the xf86ConfigLayout.screens table if it's empty https://bugs.freedesktop.org/show_bug.cgi?id=25874 Signed-off-by: Alan Coopersmith <[email protected]> Reviewed-by: Tiago Vignatti <[email protected]> Signed-off-by: Keith Packard <[email protected]>
juergbi · Jun 18, 2010 · b8615d5 · b8615d5
1 parent 32fd575
commit b8615d5
Showing 1 changed file with 7 additions and 0 deletions.
diff --git a/hw/xfree86/common/xf86Helper.c b/hw/xfree86/common/xf86Helper.c
@@ -1440,6 +1440,13 @@ xf86MatchDevice(const char *drivername, GDevPtr **sectlist)
     if (sectlist)
 	*sectlist = NULL;
 
+    /*
+     * This can happen when running Xorg -showopts and a module like ati
+     * or vmware tries to load its submodules when xf86ConfigLayout is empty
+     */
+    if (!xf86ConfigLayout.screens)
+	return 0;
+
     /*
      * This is a very important function that matches the device sections
      * as they show up in the config file with the drivers that the server