xf86-video-intel: src/sna/sna_display.c

[Chris Wilson]

 src/sna/sna_display.c |    2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

New commits:
commit 60ebac591596ccb768b684b1909064570dd1cf47
Author: Chris Wilson <chris at chris-wilson.co.uk>
Date:   Fri Dec 12 07:55:51 2014 +0000

    sna: Add another Xinerama vs RandR guard
    
    Another place used rrScrPriv without checking for its validity.
    
    Bugzilla: https://bugs.freedesktop.org/show_bug.cgi?id=87257
    Signed-off-by: Chris Wilson <chris at chris-wilson.co.uk>

diff --git a/src/sna/sna_display.c b/src/sna/sna_display.c
index 772c836..90414c7 100644
--- a/src/sna/sna_display.c
+++ b/src/sna/sna_display.c
@@ -5924,7 +5924,7 @@ sna_mode_set_primary(struct sna *sna)
 	rrScrPrivPtr rr = rrGetScrPriv(xf86ScrnToScreen(sna->scrn));
 	int i;
 
-	if (rr->primaryOutput)
+	if (rr == NULL || rr->primaryOutput)
 		return;
 
 	for (i = 0; i < sna->mode.num_real_output; i++) {