xserver: Branch 'master'

[Adam Jackson]

 randr/rrmode.c |    2 ++
 1 file changed, 2 insertions(+)

New commits:
commit a46c30c3be33ffb304a885503c8aaa78396ed3d9
Author: Jernej Azarija <azi.stdout at gmail.com>
Date:   Sun Nov 18 11:44:36 2007 -0500

    Bug #12531: RRModesForScreen can fail to allocate.

diff --git a/randr/rrmode.c b/randr/rrmode.c
index 1117581..f060d22 100644
--- a/randr/rrmode.c
+++ b/randr/rrmode.c
@@ -165,6 +165,8 @@ RRModesForScreen (ScreenPtr pScreen, int *num_ret)
     int		num_screen_modes = 0;
 
     screen_modes = xalloc ((num_modes ? num_modes : 1) * sizeof (RRModePtr));
+    if (!screen_modes)
+	return NULL;
     
     /*
      * Add modes from all outputs