Fix the fix for CAN-2005-2495.

Among other, this shoud fix problems with wine - thanks to
Robert Backhaus (robbak at gmail.com) for testing.

Obtained from:	Xorg CVS

2 files changed, 44 insertions, 30 deletions

diff --git a/x11-servers/xorg-server/Makefile b/x11-servers/xorg-server/Makefile
index 5b2628813f4..06adc35fe0e 100644
--- a/x11-servers/xorg-server/Makefile
+++ b/x11-servers/xorg-server/Makefile
@@ -7,7 +7,7 @@
 
 PORTNAME=	xorg-server
 PORTVERSION=	6.8.2
-PORTREVISION=	5
+PORTREVISION=	6
 CATEGORIES=	x11-servers
 MASTER_SITES=	${MASTER_SITE_XORG}
 MASTER_SITE_SUBDIR=	X11R${PORTVERSION}/src
diff --git a/x11-servers/xorg-server/files/patch-CAN-2005-2495 b/x11-servers/xorg-server/files/patch-CAN-2005-2495
index e9b7ded0973..3f39cffb221 100644
--- a/x11-servers/xorg-server/files/patch-CAN-2005-2495
+++ b/x11-servers/xorg-server/files/patch-CAN-2005-2495
@@ -1,6 +1,6 @@
 --- programs/Xserver/afb/afbpixmap.c.orig	Fri Apr 23 20:59:39 2004
-+++ programs/Xserver/afb/afbpixmap.c	Tue Sep  6 17:08:01 2005
-@@ -73,10 +73,14 @@ afbCreatePixmap(pScreen, width, height, 
++++ programs/Xserver/afb/afbpixmap.c	Sun Sep 18 04:56:02 2005
+@@ -73,10 +73,14 @@
  	int				depth;
  {
  	PixmapPtr pPixmap;
@@ -11,15 +11,15 @@
  
  	paddedWidth = BitmapBytePad(width);
 +
-+	if (paddedWidth > 32767 || height > 32767)
++	if (paddedWidth > 32767 || height > 32767 || depth > 4)
 +	    return NullPixmap;
 +	
  	datasize = height * paddedWidth * depth;
  	pPixmap = AllocatePixmap(pScreen, datasize);
  	if (!pPixmap)
 --- programs/Xserver/cfb/cfbpixmap.c.orig	Fri Apr 23 21:00:12 2004
-+++ programs/Xserver/cfb/cfbpixmap.c	Tue Sep  6 17:08:01 2005
-@@ -70,10 +70,13 @@ cfbCreatePixmap (pScreen, width, height,
++++ programs/Xserver/cfb/cfbpixmap.c	Sun Sep 18 04:56:02 2005
+@@ -70,10 +70,13 @@
      int		depth;
  {
      PixmapPtr pPixmap;
@@ -30,14 +30,14 @@
  
      paddedWidth = PixmapBytePad(width, depth);
 +
-+    if (paddedWidth > 32767 || height > 32767)
++    if (paddedWidth / 4 > 32767 || height > 32767)
 +	return NullPixmap;
      datasize = height * paddedWidth;
      pPixmap = AllocatePixmap(pScreen, datasize);
      if (!pPixmap)
 --- programs/Xserver/dix/dispatch.c.orig	Mon Dec 13 02:23:05 2004
-+++ programs/Xserver/dix/dispatch.c	Tue Sep  6 17:08:01 2005
-@@ -1506,6 +1506,23 @@ ProcCreatePixmap(client)
++++ programs/Xserver/dix/dispatch.c	Sun Sep 18 04:56:02 2005
+@@ -1506,6 +1506,23 @@
  	client->errorValue = 0;
          return BadValue;
      }
@@ -61,9 +61,21 @@
      if (stuff->depth != 1)
      {
          pDepth = pDraw->pScreen->allowedDepths;
+--- programs/Xserver/dix/pixmap.c.orig	Fri Apr 23 21:04:44 2004
++++ programs/Xserver/dix/pixmap.c	Sun Sep 18 04:56:02 2005
+@@ -126,6 +126,9 @@
+     unsigned size;
+     int i;
+ 
++    if (pScreen->totalPixmapSize > ((size_t)-1) - pixDataSize)
++	return NullPixmap;
++    
+     pPixmap = (PixmapPtr)xalloc(pScreen->totalPixmapSize + pixDataSize);
+     if (!pPixmap)
+ 	return NullPixmap;
 --- programs/Xserver/fb/fbpixmap.c.orig	Mon Aug  9 05:40:50 2004
-+++ programs/Xserver/fb/fbpixmap.c	Tue Sep  6 17:08:01 2005
-@@ -32,12 +32,14 @@ PixmapPtr
++++ programs/Xserver/fb/fbpixmap.c	Sun Sep 18 04:56:02 2005
+@@ -32,12 +32,14 @@
  fbCreatePixmapBpp (ScreenPtr pScreen, int width, int height, int depth, int bpp)
  {
      PixmapPtr	pPixmap;
@@ -75,14 +87,14 @@
      int		base;
  
      paddedWidth = ((width * bpp + FB_MASK) >> FB_SHIFT) * sizeof (FbBits);
-+    if (paddedWidth > 32767 || height > 32767)
++    if (paddedWidth / 4 > 32767 || height > 32767)
 +	return NullPixmap;
      datasize = height * paddedWidth;
  #ifdef PIXPRIV
      base = pScreen->totalPixmapSize;
 --- programs/Xserver/hw/xfree86/xaa/xaaInit.c.orig	Fri Jul 30 22:30:56 2004
-+++ programs/Xserver/hw/xfree86/xaa/xaaInit.c	Tue Sep  6 17:08:01 2005
-@@ -498,6 +498,9 @@ XAACreatePixmap(ScreenPtr pScreen, int w
++++ programs/Xserver/hw/xfree86/xaa/xaaInit.c	Sun Sep 18 04:56:02 2005
+@@ -498,6 +498,9 @@
      XAAPixmapPtr pPriv;
      PixmapPtr pPix = NULL;
      int size = w * h;
@@ -93,8 +105,8 @@
      if (!infoRec->offscreenDepthsInitialized)
  	XAAInitializeOffscreenDepths (pScreen);
 --- programs/Xserver/hw/xfree86/xf4bpp/ppcPixmap.c.orig	Fri Apr 23 21:54:17 2004
-+++ programs/Xserver/hw/xfree86/xf4bpp/ppcPixmap.c	Tue Sep  6 17:08:01 2005
-@@ -85,14 +85,18 @@ xf4bppCreatePixmap( pScreen, width, heig
++++ programs/Xserver/hw/xfree86/xf4bpp/ppcPixmap.c	Sun Sep 18 04:56:02 2005
+@@ -85,7 +85,7 @@
      int		depth ;
  {
      register PixmapPtr pPixmap  = (PixmapPtr)NULL;
@@ -103,20 +115,20 @@
      
      TRACE(("xf4bppCreatePixmap(pScreen=0x%x, width=%d, height=%d, depth=%d)\n", pScreen, width, height, depth)) ;
  
-     if ( depth > 8 )
+@@ -93,6 +93,10 @@
  	return (PixmapPtr) NULL ;
  
-+    if (width > 32767 || height > 32767)
-+	return (PixmapPtr) NULL ;
-+    
      size = PixmapBytePad(width, depth);
 +
++    if (size / 4 > 32767 || height > 32767)
++	return (PixmapPtr) NULL ;
++    
      pPixmap = AllocatePixmap (pScreen, (height * size));
      
      if ( !pPixmap )
 --- programs/Xserver/ilbm/ilbmpixmap.c.orig	Fri Apr 23 21:54:22 2004
-+++ programs/Xserver/ilbm/ilbmpixmap.c	Tue Sep  6 17:08:01 2005
-@@ -75,10 +75,12 @@ ilbmCreatePixmap(pScreen, width, height,
++++ programs/Xserver/ilbm/ilbmpixmap.c	Sun Sep 18 04:56:02 2005
+@@ -75,10 +75,12 @@
  	int				depth;
  {
  	PixmapPtr pPixmap;
@@ -126,14 +138,14 @@
 +	size_t paddedWidth;
  
  	paddedWidth = BitmapBytePad(width);
-+	if (paddedWidth > 32767 || height > 32767)
++	if (paddedWidth > 32767 || height > 32767 || depth > 4)
 +		return NullPixmap;
  	datasize = height * paddedWidth * depth;
  	pPixmap = AllocatePixmap(pScreen, datasize);
  	if (!pPixmap)
 --- programs/Xserver/iplan2p4/iplpixmap.c.orig	Fri Apr 23 21:54:24 2004
-+++ programs/Xserver/iplan2p4/iplpixmap.c	Tue Sep  6 17:08:01 2005
-@@ -74,12 +74,14 @@ iplCreatePixmap (pScreen, width, height,
++++ programs/Xserver/iplan2p4/iplpixmap.c	Sun Sep 18 04:56:02 2005
+@@ -74,12 +74,14 @@
      int		depth;
  {
      PixmapPtr pPixmap;
@@ -145,14 +157,14 @@
  
      paddedWidth = PixmapBytePad(width, depth);
      paddedWidth = (paddedWidth + ipad) & ~ipad;
-+    if (paddedWidth > 32767 || height > 32767)
++    if (paddedWidth / 4 > 32767 || height > 32767)
 +	return NullPixmap;
      datasize = height * paddedWidth;
      pPixmap = AllocatePixmap(pScreen, datasize);
      if (!pPixmap)
 --- programs/Xserver/mfb/mfbpixmap.c.orig	Fri Nov 14 17:48:57 2003
-+++ programs/Xserver/mfb/mfbpixmap.c	Tue Sep  6 17:08:01 2005
-@@ -72,10 +72,12 @@ mfbCreatePixmap (pScreen, width, height,
++++ programs/Xserver/mfb/mfbpixmap.c	Sun Sep 18 04:56:02 2005
+@@ -72,12 +72,14 @@
      int		depth;
  {
      PixmapPtr pPixmap;
@@ -162,8 +174,10 @@
 +    size_t paddedWidth;
  
      if (depth != 1)
-+	return NullPixmap;
-+    if (width > 32767 || height > 32767)
  	return NullPixmap;
      paddedWidth = BitmapBytePad(width);
++    if (paddedWidth / 4 > 32767 || height > 32767)
++	return NullPixmap;
      datasize = height * paddedWidth;
+     pPixmap = AllocatePixmap(pScreen, datasize);
+     if (!pPixmap)