xserver: Branch 'master'

[Maarten Maathuis]

 hw/xfree86/modes/xf86Crtc.c |    2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

New commits:
commit 82fba7697fbbb6f66cc22424ba99755b99ff482e
Author: Maarten Maathuis <madman2003 at gmail.com>
Date:   Mon Dec 22 00:33:55 2008 +0100

    xfree86/randr: Avoid a crash when xf86CrtcConfigPrivateIndex is -1.

diff --git a/hw/xfree86/modes/xf86Crtc.c b/hw/xfree86/modes/xf86Crtc.c
index 309eb99..fdbd385 100644
--- a/hw/xfree86/modes/xf86Crtc.c
+++ b/hw/xfree86/modes/xf86Crtc.c
@@ -3152,7 +3152,7 @@ xf86_crtc_supports_gamma(ScrnInfoPtr pScrn)
     xf86CrtcConfigPtr xf86_config = XF86_CRTC_CONFIG_PTR(pScrn);
     xf86CrtcPtr crtc;
 
-    if (!xf86_config)
+    if ((xf86CrtcConfigPrivateIndex == -1) || !xf86_config)
 	return FALSE;
 
     if (xf86_config->num_crtc == 0)