From addfa653cf51fa45c7eae49be1fd722aaadf97d6 Mon Sep 17 00:00:00 2001 From: Chris Wilson Date: Wed, 26 Sep 2012 08:59:18 +0100 Subject: [PATCH] uxa: Prevent attempting to call intel_mode_fini() before PreInit runs In the Ubuntu xserver it is apparently possible for the Screen to be deleted prior to being fully initialised. Make sure we don't crash in that situation! Bugzilla: https://bugs.freedesktop.org/show_bug.cgi?id=55346 Signed-off-by: Chris Wilson --- src/intel_display.c | 3 +++ 1 file changed, 3 insertions(+) diff --git a/src/intel_display.c b/src/intel_display.c index 2a3a393c..60af4157 100644 --- a/src/intel_display.c +++ b/src/intel_display.c @@ -1770,6 +1770,9 @@ intel_mode_fini(intel_screen_private *intel) { struct intel_mode *mode = intel->modes; + if (mode == NULL) + return; + while(!list_is_empty(&mode->crtcs)) { xf86CrtcDestroy(list_first_entry(&mode->crtcs, struct intel_crtc,