From 583efd4ba067a0a4319e43ebc18dd81ed9c8db0a Mon Sep 17 00:00:00 2001 From: Chris Wilson Date: Thu, 27 Dec 2012 17:59:59 +0000 Subject: [PATCH] sna: Sanity check config->compat_output In a headless setup this may be left initialised to -1. Signed-off-by: Chris Wilson --- src/sna/sna_display.c | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) diff --git a/src/sna/sna_display.c b/src/sna/sna_display.c index 48b53a77..2f8e6dff 100644 --- a/src/sna/sna_display.c +++ b/src/sna/sna_display.c @@ -1312,9 +1312,12 @@ sna_crtc_dpms(xf86CrtcPtr crtc, int mode) void sna_mode_adjust_frame(struct sna *sna, int x, int y) { xf86CrtcConfigPtr config = XF86_CRTC_CONFIG_PTR(sna->scrn); - xf86OutputPtr output = config->output[config->compat_output]; - xf86CrtcPtr crtc = output->crtc; + xf86CrtcPtr crtc; + if ((unsigned)config->compat_output >= config->num_output) + return; + + crtc = config->output[config->compat_output]->crtc; if (crtc && crtc->enabled) { int saved_x = crtc->x; int saved_y = crtc->y;