Backport: randr: check for virtual size limits before set crtc

Return a error if the screen is configured to an invalid size. Signed-off-by: Tiago Vignatti <tiago.vignatti@nokia.com> Reviewed-by: Adam Jackson <ajax@redhat.com> Reviewed-by: Daniel Stone <daniel@fooishbar.org> Signed-off-by: Keith Packard <keithp@keithp.com>

Backport: randr: check for virtual size limits before set crtc
da678db0 · Tiago Vignatti · Ulrich Sibiller · 2aeb7671 · da678db0
Commit da678db0 authored Dec 17, 2010 by Tiago Vignatti Committed by Ulrich Sibiller Jun 07, 2015
Hide whitespace changes
Inline Side-by-side

Showing with 12 additions and 0 deletions

rrscreen.c nx-X11/programs/Xserver/randr/rrscreen.c +12 -0

No files found.
--- a/nx-X11/programs/Xserver/randr/rrscreen.c
+++ b/nx-X11/programs/Xserver/randr/rrscreen.c
@@ -938,6 +938,18 @@ ProcRRSetScreenConfig (ClientPtr client)
 	width = mode->mode.height;
 	height = mode->mode.width;
    }
+
+    if (width < pScrPriv->minWidth || pScrPriv->maxWidth < width) {
+	client->errorValue = width;
+	free(pData);
+	return BadValue;
+    }
+    if (height < pScrPriv->minHeight || pScrPriv->maxHeight < height) {
+	client->errorValue = height;
+	free(pData);
+	return BadValue;
+    }
+
    if (width != pScreen->width || height != pScreen->height)
    {
 	int	c;