Backport: randr: fix server crash in RRGetScreenInfo

We don't return rates to randr < 1.1 clients, so don't allocate space for them. This fixes a FatalError due to not all allocated space being used. X.Org bug#21861 <http://bugs.freedesktop.org/show_bug.cgi?id=21861> Reported-by: Guillaume Quintin <coincoin169g@gmail.com> Signed-off-by: Julien Cristau <jcristau@debian.org>

Backport: randr: fix server crash in RRGetScreenInfo
faddfbec · Julien Cristau · Ulrich Sibiller · da678db0 · faddfbec
Commit faddfbec authored May 22, 2009 by Julien Cristau Committed by Ulrich Sibiller Jun 07, 2015
Show whitespace changes
Inline Side-by-side

Showing with 3 additions and 2 deletions

rrscreen.c nx-X11/programs/Xserver/randr/rrscreen.c +3 -2

No files found.
--- a/nx-X11/programs/Xserver/randr/rrscreen.c
+++ b/nx-X11/programs/Xserver/randr/rrscreen.c
@@ -677,8 +677,9 @@ ProcRRGetScreenInfo (ClientPtr client)
 	rep.sizeID = pData->size;
 	rep.rate = pData->refresh;
-	extraLen = (rep.nSizes * sizeof (xScreenSizes) +
+	extraLen = rep.nSizes * sizeof (xScreenSizes);
-		    rep.nrateEnts * sizeof (CARD16));
+	if (has_rate)
+		extraLen += rep.nrateEnts * sizeof (CARD16);
 	if (extraLen)
 	{