xserver: Branch 'master'

[Keith Packard]

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

New commits:
diff-tree 2926cf1da7e4ed63573bfaecdd7e19beb3057d9b (from b2dcfbca2441ca8c561f86a78a76ab59ecbb40e4)
Author: Gustavo Pichorim Boiko <boiko at mandriva.com>
Date:   Thu Aug 2 18:09:52 2007 -0300

    [PATCH] Allocate the right number of entries for saving crtcs

diff --git a/hw/xfree86/modes/xf86RandR12.c b/hw/xfree86/modes/xf86RandR12.c
index 889be6f..9d74e53 100644
--- a/hw/xfree86/modes/xf86RandR12.c
+++ b/hw/xfree86/modes/xf86RandR12.c
@@ -716,7 +716,7 @@ xf86RandR12CrtcSet (ScreenPtr	pScreen,
     xf86CrtcPtr		*save_crtcs;
     Bool		save_enabled = crtc->enabled;
 
-    save_crtcs = ALLOCATE_LOCAL(config->num_crtc * sizeof (xf86CrtcPtr));
+    save_crtcs = ALLOCATE_LOCAL(config->num_output * sizeof (xf86CrtcPtr));
     if ((randr_mode != NULL) != crtc->enabled)
 	changed = TRUE;
     else if (randr_mode && !xf86RandRModeMatches (randr_mode, &crtc->mode))