From 45d2cfad3bb2ac4246dc1863e5b8689d6bb34fa8 Mon Sep 17 00:00:00 2001
From: Matthieu Herrb <matthieu@cvs.openbsd.org>
Date: Sat, 2 Apr 2011 16:08:42 +0000
Subject: Update to xserver 1.9.5. Tested by jasper@, ajacoutot@ and krw@

---
 xserver/randr/rrscreen.c | 12 ++++++++++++
 1 file changed, 12 insertions(+)

(limited to 'xserver/randr')

diff --git a/xserver/randr/rrscreen.c b/xserver/randr/rrscreen.c
index f58e6578a..1bc1a9ea1 100644
--- a/xserver/randr/rrscreen.c
+++ b/xserver/randr/rrscreen.c
@@ -915,6 +915,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;
-- 
cgit v1.2.3