Don't do fixup_video_driver_list if no drivers. (I had signal 11 and core

dump when drivers not installed yet.)
TODO: fix fixup_video_driver_list to handle NULL argument.
This commit is contained in:
Jeremy C. Reed 2006-05-25 23:32:33 +00:00
parent c6b1cff432
commit 354086d7e8
2 changed files with 11 additions and 2 deletions

View File

@ -1,3 +1,12 @@
2006-05-25 Jeremy C. Reed <reed@reedmedia.net>
reviewed by: Adam Jackson
* hw/xfree86/common/xf86Config.c: (GenerateDriverlist):
Don't do fixup_video_driver_list if no drivers. (I had
signal 11 and core dump when drivers not installed yet.)
(TODO: fix fixup_video_driver_list to handle NULL argument.)
2006-05-25 Matthieu Herrb <matthieu.herrb@laas.fr>
* mi/midispcur.c: (miDCCloseScreen)

View File

@ -1,4 +1,4 @@
/* $XdotOrg: xserver/xorg/hw/xfree86/common/xf86Config.c,v 1.27 2006/04/07 01:37:11 ajax Exp $ */
/* $XdotOrg: xserver/xorg/hw/xfree86/common/xf86Config.c,v 1.28 2006/04/07 01:41:00 ajax Exp $ */
/* $XFree86: xc/programs/Xserver/hw/xfree86/common/xf86Config.c,v 3.276 2003/10/08 14:58:26 dawes Exp $ */
@ -510,7 +510,7 @@ GenerateDriverlist(char * dirname, char * drivernames)
ret = LoaderListDirs(subdirs, patlist);
/* fix up the probe order for video drivers */
if (strstr(dirname, "drivers"))
if (strstr(dirname, "drivers") && ret != NULL)
fixup_video_driver_list(ret);
return ret;