xserver: Branch 'master'

[Keith Packard]

 hw/xfree86/common/xf86Helper.c |    7 +++++++
 1 file changed, 7 insertions(+)

New commits:
commit b8615d592700b7be319c04cc0563fdeb5a266534
Author: Alan Coopersmith <alan.coopersmith at oracle.com>
Date:   Sat Jun 12 08:19:16 2010 -0700

    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 <alan.coopersmith at oracle.com>
    Reviewed-by: Tiago Vignatti <tiago.vignatti at nokia.com>
    Signed-off-by: Keith Packard <keithp at keithp.com>

diff --git a/hw/xfree86/common/xf86Helper.c b/hw/xfree86/common/xf86Helper.c
index cd48914..07f9f0a 100644
--- a/hw/xfree86/common/xf86Helper.c
+++ b/hw/xfree86/common/xf86Helper.c
@@ -1441,6 +1441,13 @@ xf86MatchDevice(const char *drivername, GDevPtr **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
      * loads at run time.