head	1.2;
access;
symbols
	pkgsrc-2013Q2:1.2.0.24
	pkgsrc-2013Q2-base:1.2
	pkgsrc-2012Q4:1.2.0.22
	pkgsrc-2012Q4-base:1.2
	pkgsrc-2011Q4:1.2.0.20
	pkgsrc-2011Q4-base:1.2
	pkgsrc-2011Q2:1.2.0.18
	pkgsrc-2011Q2-base:1.2
	pkgsrc-2009Q4:1.2.0.16
	pkgsrc-2009Q4-base:1.2
	pkgsrc-2008Q4:1.2.0.14
	pkgsrc-2008Q4-base:1.2
	pkgsrc-2008Q3:1.2.0.12
	pkgsrc-2008Q3-base:1.2
	cube-native-xorg:1.2.0.10
	cube-native-xorg-base:1.2
	pkgsrc-2008Q2:1.2.0.8
	pkgsrc-2008Q2-base:1.2
	pkgsrc-2008Q1:1.2.0.6
	pkgsrc-2008Q1-base:1.2
	pkgsrc-2007Q4:1.2.0.4
	pkgsrc-2007Q4-base:1.2
	pkgsrc-2007Q3:1.2.0.2
	pkgsrc-2007Q3-base:1.2
	pkgsrc-2007Q2:1.1.0.6
	pkgsrc-2007Q2-base:1.1
	pkgsrc-2007Q1:1.1.0.4
	pkgsrc-2007Q1-base:1.1
	pkgsrc-2006Q4:1.1.0.2;
locks; strict;
comment	@# @;


1.2
date	2007.08.17.20.25.42;	author joerg;	state dead;
branches;
next	1.1;

1.1
date	2007.01.17.16.32.35;	author joerg;	state Exp;
branches
	1.1.2.1;
next	;

1.1.2.1
date	2007.01.17.16.32.35;	author salo;	state dead;
branches;
next	1.1.2.2;

1.1.2.2
date	2007.01.17.19.29.39;	author salo;	state Exp;
branches;
next	;


desc
@@


1.2
log
@To quote Johnny Lam: "In modular-xorg we trust"

Remove xorg 6.9 packages from pkgsrc.
@
text
@$NetBSD: patch-cw,v 1.1 2007/01/17 16:32:35 joerg Exp $

--- programs/Xserver/render/render.c.orig	2005-08-28 19:47:39.000000000 +0000
+++ programs/Xserver/render/render.c
@@@@ -52,6 +52,10 @@@@
 #include "xf86_ansic.h"
 #endif
 
+#if !defined(UINT32_MAX)
+#define UINT32_MAX 0xffffffffU
+#endif
+
 static int ProcRenderQueryVersion (ClientPtr pClient);
 static int ProcRenderQueryPictFormats (ClientPtr pClient);
 static int ProcRenderQueryPictIndexValues (ClientPtr pClient);
@@@@ -1108,11 +1112,14 @@@@ ProcRenderAddGlyphs (ClientPtr client)
     }
 
     nglyphs = stuff->nglyphs;
+    if (nglyphs > UINT32_MAX / sizeof(GlyphNewRec))
+	    return BadAlloc;
+
     if (nglyphs <= NLOCALGLYPH)
 	glyphsBase = glyphsLocal;
     else
     {
-	glyphsBase = (GlyphNewPtr) ALLOCATE_LOCAL (nglyphs * sizeof (GlyphNewRec));
+	glyphsBase = (GlyphNewPtr) Xalloc (nglyphs * sizeof (GlyphNewRec));
 	if (!glyphsBase)
 	    return BadAlloc;
     }
@@@@ -1169,7 +1176,7 @@@@ ProcRenderAddGlyphs (ClientPtr client)
     }
 
     if (glyphsBase != glyphsLocal)
-	DEALLOCATE_LOCAL (glyphsBase);
+	Xfree (glyphsBase);
     return client->noClientException;
 bail:
     while (glyphs != glyphsBase)
@@@@ -1178,7 +1185,7 @@@@ bail:
 	xfree (glyphs->glyph);
     }
     if (glyphsBase != glyphsLocal)
-	DEALLOCATE_LOCAL (glyphsBase);
+	Xfree (glyphsBase);
     return err;
 }
 
@


1.1
log
@Add vendor patch for CVE-2006-6101, CVE-2006-6102 and CVE-2006-6103;
this fixes possible overflows in the extensions dbe and render.
@
text
@d1 1
a1 1
$NetBSD$
@


1.1.2.1
log
@file patch-cw was added on branch pkgsrc-2006Q4 on 2007-01-17 16:32:35 +0000
@
text
@d1 49
@


1.1.2.2
log
@Pullup ticket 1998 - requested by joerg
security fix for xorg-server

Revisions pulled up:
- pkgsrc/x11/xorg-server/Makefile			1.50
- pkgsrc/x11/xorg-libs/distinfo				1.58
- pkgsrc/x11/xorg-libs/patches/patch-cv			1.1
- pkgsrc/x11/xorg-libs/patches/patch-cw			1.1

   Module Name:		pkgsrc
   Committed By:	joerg
   Date:		Wed Jan 17 16:32:35 UTC 2007

   Modified Files:
   	pkgsrc/x11/xorg-libs: distinfo
   	pkgsrc/x11/xorg-server: Makefile
   Added Files:
   	pkgsrc/x11/xorg-libs/patches: patch-cv patch-cw

   Log Message:
   Add vendor patch for CVE-2006-6101, CVE-2006-6102 and CVE-2006-6103;
   this fixes possible overflows in the extensions dbe and render.
@
text
@a0 49
$NetBSD: patch-cw,v 1.1.2.1 2007/01/17 19:29:39 salo Exp $

--- programs/Xserver/render/render.c.orig	2005-08-28 19:47:39.000000000 +0000
+++ programs/Xserver/render/render.c
@@@@ -52,6 +52,10 @@@@
 #include "xf86_ansic.h"
 #endif
 
+#if !defined(UINT32_MAX)
+#define UINT32_MAX 0xffffffffU
+#endif
+
 static int ProcRenderQueryVersion (ClientPtr pClient);
 static int ProcRenderQueryPictFormats (ClientPtr pClient);
 static int ProcRenderQueryPictIndexValues (ClientPtr pClient);
@@@@ -1108,11 +1112,14 @@@@ ProcRenderAddGlyphs (ClientPtr client)
     }
 
     nglyphs = stuff->nglyphs;
+    if (nglyphs > UINT32_MAX / sizeof(GlyphNewRec))
+	    return BadAlloc;
+
     if (nglyphs <= NLOCALGLYPH)
 	glyphsBase = glyphsLocal;
     else
     {
-	glyphsBase = (GlyphNewPtr) ALLOCATE_LOCAL (nglyphs * sizeof (GlyphNewRec));
+	glyphsBase = (GlyphNewPtr) Xalloc (nglyphs * sizeof (GlyphNewRec));
 	if (!glyphsBase)
 	    return BadAlloc;
     }
@@@@ -1169,7 +1176,7 @@@@ ProcRenderAddGlyphs (ClientPtr client)
     }
 
     if (glyphsBase != glyphsLocal)
-	DEALLOCATE_LOCAL (glyphsBase);
+	Xfree (glyphsBase);
     return client->noClientException;
 bail:
     while (glyphs != glyphsBase)
@@@@ -1178,7 +1185,7 @@@@ bail:
 	xfree (glyphs->glyph);
     }
     if (glyphsBase != glyphsLocal)
-	DEALLOCATE_LOCAL (glyphsBase);
+	Xfree (glyphsBase);
     return err;
 }
 
@