Attachment 36220 Details for Bug 25874 – Patch that fixes the crash for me

[patch] Patch that fixes the crash for me

0001-Bug-25874-coredump-on-X-showopts.patch (text/plain), 1.18 KB, created by Alan Coopersmith on 2010-06-11 11:28:24 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Alan Coopersmith

Created: 2010-06-11 11:28:24 UTC

Size: 1.18 KB

patch

obsolete

>From 4b6ba491c0a6534d9c095fa75a83b13a70734584 Mon Sep 17 00:00:00 2001
>From: Alan Coopersmith <alan.coopersmith@oracle.com>
>Date: Fri, 11 Jun 2010 11:26:12 -0700
>Subject: [PATCH] Bug 25874 - coredump on "X -showopts"
>
>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>
>---
> 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..6978c63 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 it's 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.
>-- 
>1.5.6.5
>

Actions: View | Splinter Review

Attachments on bug 25874: 32416 | 36220 | 36361

Use of freedesktop.org services, including Bugzilla, is subject to our Code of Conduct. How we collect and use information is described in our Privacy Policy.