xserver: Branch 'master'

[Alex Deucher]

 hw/xfree86/modes/xf86Crtc.c |    4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

New commits:
diff-tree 92355314103d2193ca20786915eaf608922a36dc (from edd88170836ec985ab1a59179de69d50644b8dff)
Author: Michel Dänzer <daenzer at debian.org>
Date:   Sat Sep 22 14:25:02 2007 -0400

    Fix possible crash if Xv window is outside of either crtc

diff --git a/hw/xfree86/modes/xf86Crtc.c b/hw/xfree86/modes/xf86Crtc.c
index d375da8..2fd56a2 100644
--- a/hw/xfree86/modes/xf86Crtc.c
+++ b/hw/xfree86/modes/xf86Crtc.c
@@ -2250,7 +2250,9 @@ xf86_crtc_clip_video_helper(ScrnInfoPtr 
 	    REGION_INIT (pScreen, &crtc_region_local, &crtc_box, 1);
 	    crtc_region = &crtc_region_local;
 	    REGION_INTERSECT (pScreen, crtc_region, crtc_region, reg);
-	}
+	} else
+	    return FALSE;
+
 	*crtc_ret = crtc;
     }