DoConfigure() attempts to call the PreInit handler on a device without checking that the handler exists.
Check that the PreInit handler exists for a device before attempting to call it. Signed-off-by: Jeff Smith <[email protected]> --- hw/xfree86/common/xf86Configure.c | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/hw/xfree86/common/xf86Configure.c b/hw/xfree86/common/xf86Configure.c index 4026e3b5b..7deb86359 100644 --- a/hw/xfree86/common/xf86Configure.c +++ b/hw/xfree86/common/xf86Configure.c @@ -775,7 +775,8 @@ DoConfigure(void) ConfiguredMonitor = NULL; - if ((*xf86Screens[dev2screen[j]]->PreInit) (xf86Screens[dev2screen[j]], + if ((*xf86Screens[dev2screen[j]]->PreInit) && + (*xf86Screens[dev2screen[j]]->PreInit) (xf86Screens[dev2screen[j]], PROBE_DETECT) && ConfiguredMonitor) { monitor_ptr = configureDDCMonitorSection(j); -- 2.14.3 _______________________________________________ [email protected]: X.Org development Archives: http://lists.x.org/archives/xorg-devel Info: https://lists.x.org/mailman/listinfo/xorg-devel
