frederik
/
xserver
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

xfree86: Do not use uninitialized pointer during probe 

Commits b5dffbb and d75ffcd introduce code in xf86platformProbe() that
references a member of xf86configptr.  However, when using the
"-configure" option, xf86configptr may not be initialized when
xf86platformProbe() is called.

Avoid referencing a member of xf86configptr if uninitialized.

Bugzilla: https://bugs.freedesktop.org/show_bug.cgi?id=100405
Signed-off-by: Jeff Smith <whydoubt@gmail.com>
Reviewed-by: Adam Jackson <ajax@redhat.com>
This commit is contained in:
Jeff Smith 2018-02-04 23:17:52 -06:00 committed by Adam Jackson
parent 1e23f03dd5
commit 1a24a0ae7b
1 changed files with 4 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
hw/xfree86/common/xf86platformBus.c
View File

@ -276,7 +276,8 @@ xf86platformProbe(void)
{ {
int i; int i;
Bool pci = TRUE; Bool pci = TRUE;
XF86ConfOutputClassPtr cl; XF86ConfOutputClassPtr cl, cl_head = (xf86configptr) ?
xf86configptr->conf_outputclass_lst : NULL;
char *old_path, *path = NULL; char *old_path, *path = NULL;
config_odev_probe(xf86PlatformDeviceProbe); config_odev_probe(xf86PlatformDeviceProbe);
@ -296,7 +297,7 @@ xf86platformProbe(void)
* Deal with OutputClass ModulePath directives, these must be * Deal with OutputClass ModulePath directives, these must be
* processed before we do any module loading. * processed before we do any module loading.
*/ */
for (cl = xf86configptr->conf_outputclass_lst; cl; cl = cl->list.next) { for (cl = cl_head; cl; cl = cl->list.next) {
if (!OutputClassMatches(cl, &xf86_platform_devices[i])) if (!OutputClassMatches(cl, &xf86_platform_devices[i]))
continue; continue;
@ -317,7 +318,7 @@ xf86platformProbe(void)
/* First see if there is an OutputClass match marking a device as primary */ /* First see if there is an OutputClass match marking a device as primary */
for (i = 0; i < xf86_num_platform_devices; i++) { for (i = 0; i < xf86_num_platform_devices; i++) {
struct xf86_platform_device *dev = &xf86_platform_devices[i]; struct xf86_platform_device *dev = &xf86_platform_devices[i];
for (cl = xf86configptr->conf_outputclass_lst; cl; cl = cl->list.next) { for (cl = cl_head; cl; cl = cl->list.next) {
if (!OutputClassMatches(cl, dev)) if (!OutputClassMatches(cl, dev))
continue; continue;