[PATCH] Bug 25874 - coredump on "X -showopts"

Alan Coopersmith alan.coopersmith at oracle.com
Sat Jun 12 08:15:37 PDT 2010


Tiago Vignatti wrote:
> On Fri, Jun 11, 2010 at 08:29:25PM +0200, ext Alan Coopersmith wrote:
>> 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>
>> ---
>>  hw/xfree86/common/xf86Helper.c |    7 +++++++
>>  1 files changed, 7 insertions(+), 0 deletions(-)
>>
>> diff --git a/hw/xfree86/common/xf86Helper.c b/hw/xfree86/common/xf86Helper.c
>> index cd48914..45a20bd 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 )
> 
> this code style using blank spaces seems not the one we're using in this
> context, right? I'd fix it.

Yeah, brain failure to context switch from working on code that did use
that style.   Thanks for paying more attention than I was.

-- 
	-Alan Coopersmith-        alan.coopersmith at oracle.com
	 Oracle Solaris Platform Engineering: X Window System



More information about the xorg-devel mailing list