fdo-mirrors/xserver
1
0
Fork 0
mirror of https://gitlab.freedesktop.org/xorg/xserver.git synced 2025-12-25 18:50:05 +01:00
Code Issues Projects Releases Packages Wiki Activity Actions

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

Browse source 
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@oracle.com>
Reviewed-by: Tiago Vignatti <tiago.vignatti@nokia.com>
Signed-off-by: Keith Packard <keithp@keithp.com>
(cherry picked from commit b8615d5927)
This commit is contained in:
Alan Coopersmith 2010-06-12 08:19:16 -07:00 • committed by Jeremy Huddleston
parent 6c1da48ca5
commit 87f84e8e66
1 changed files with 7 additions and 0 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

7
hw/xfree86/common/xf86Helper.c
View file

@ -1446,6 +1446,13 @@ xf86MatchDevice(const char *drivername, GDevPtr **sectlist)
if (xf86DoConfigure && xf86DoConfigurePass1) return 1;
/*
* 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