diff --git a/dix/window.c b/dix/window.c
index 00854c6..cd904fb 100644
--- a/dix/window.c
+++ b/dix/window.c
@@ -2159,7 +2159,7 @@ ConfigureWindow(WindowPtr pWin, Mask mask, XID *vlist, ClientPtr client)
 	GET_INT16(CWY, y);
 	GET_CARD16(CWWidth, w);
 	GET_CARD16 (CWHeight, h);
-	if (!w || !h)
+	if (!w || !h || w > 32767 || h > 32767)
 	{
 	    client->errorValue = 0;
 	    return BadValue;