Bug#472823: xserver-xorg-core: segfault if no primary pci device

[Julien Cristau <jcristau@debian.org>]

tags 472823 fixed-upstream
kthxbye

On Wed, Mar 26, 2008 at 18:41:40 +0100, Gonéri Le Bouder wrote:

> To fix it on my side, I did this patch:
> diff --git a/hw/xfree86/common/xf86AutoConfig.c b/hw/xfree86/common/xf86AutoConfig.c
> index 268b50c..c64df4e 100644
> --- a/hw/xfree86/common/xf86AutoConfig.c
> +++ b/hw/xfree86/common/xf86AutoConfig.c
> @@ -436,9 +436,10 @@ chooseVideoDriver(void)
>      if (!info) {
>         ErrorF("Primary device is not PCI\n");
>      }
> -
>  #ifdef __linux__
> +    else {
>      matchDriverFromFiles(matches, info->vendor_id, info->device_id);
> +    }
>  #endif /* __linux__ */
> 
>      /* TODO Handle multiple drivers claiming to support the same PCI ID */
> 
Applied upstream:
commit 9500033b9ecdfaf5a56a4355ffc94d74cb17ca17
Author: Goneri Le Bouder <goneri@rulezlan.org>
Date:   Tue Apr 1 20:19:40 2008 +0200

    xfree86: don't crash in AutoConfig if the primary device is not pci
    
    Only call matchDriverFromFiles() if we found a pci device.
    Debian bug#472823 (http://bugs.debian.org/472823).

Thanks for the patch!

Cheers,
Julien