diff options
| author | anholt <anholt@FreeBSD.org> | 2006-05-03 16:12:21 +0800 |
|---|---|---|
| committer | anholt <anholt@FreeBSD.org> | 2006-05-03 16:12:21 +0800 |
| commit | b3162dfa2c680f6135cdfb5197738b150af03339 (patch) | |
| tree | 366b35a68722c1d1ffc8a452fb21e98be08d207b /x11-servers/xorg-server | |
| parent | bfcb052687e1cd765e5d0f42ce1f0a22c048cc5c (diff) | |
| download | freebsd-ports-gnome-b3162dfa2c680f6135cdfb5197738b150af03339.tar.gz freebsd-ports-gnome-b3162dfa2c680f6135cdfb5197738b150af03339.tar.zst freebsd-ports-gnome-b3162dfa2c680f6135cdfb5197738b150af03339.zip | |
Add my patch for buffer overflow in the Render extension's TriFan/TriStrip
requests.
Security: CVE-2006-1526
Bugzilla: https://bugs.freedesktop.org/show_bug.cgi?id=6642
Diffstat (limited to 'x11-servers/xorg-server')
| -rw-r--r-- | x11-servers/xorg-server/Makefile | 2 | ||||
| -rw-r--r-- | x11-servers/xorg-server/Makefile.inc | 1 | ||||
| -rw-r--r-- | x11-servers/xorg-server/files/patch-mitri.c | 25 |
3 files changed, 27 insertions, 1 deletions
diff --git a/x11-servers/xorg-server/Makefile b/x11-servers/xorg-server/Makefile index 781330f2d00f..7b6818824b85 100644 --- a/x11-servers/xorg-server/Makefile +++ b/x11-servers/xorg-server/Makefile @@ -7,7 +7,7 @@ PORTNAME= xorg-server PORTVERSION= 6.9.0 -PORTREVISION= 2 +PORTREVISION= 3 CATEGORIES= x11-servers MASTER_SITES= ${MASTER_SITE_XORG} MASTER_SITE_SUBDIR= X11R${PORTVERSION}/src diff --git a/x11-servers/xorg-server/Makefile.inc b/x11-servers/xorg-server/Makefile.inc index d7abe96318f4..1c5223b55c63 100644 --- a/x11-servers/xorg-server/Makefile.inc +++ b/x11-servers/xorg-server/Makefile.inc @@ -44,6 +44,7 @@ CF_PATCHES= ${PORTSDIR}/x11-servers/xorg-server/files/patch-FreeBSD.cf \ SERVER_PATCHES= ${PORTSDIR}/x11-servers/xorg-server/files/patch-Xserver-Imakefile \ ${PORTSDIR}/x11-servers/xorg-server/files/patch-Xserver-Xext-xvmc.c \ ${PORTSDIR}/x11-servers/xorg-server/files/patch-Xserver-os-xprintf.c \ + ${PORTSDIR}/x11-servers/xorg-server/files/patch-mitri.c \ ${PORTSDIR}/x11-servers/xorg-server/files/patch-servermd.h \ ${PORTSDIR}/x11-servers/xorg-server/files/patch-xf86sym.c diff --git a/x11-servers/xorg-server/files/patch-mitri.c b/x11-servers/xorg-server/files/patch-mitri.c new file mode 100644 index 000000000000..8c4ef0f57101 --- /dev/null +++ b/x11-servers/xorg-server/files/patch-mitri.c @@ -0,0 +1,25 @@ +Index: render/mitri.c +=================================================================== +RCS file: /cvs/xorg/xserver/xorg/render/mitri.c,v +retrieving revision 1.5 +diff -u -r1.5 mitri.c +--- programs/Xserver/render/mitri.c 3 Jul 2005 07:02:08 -0000 1.5 ++++ programs/Xserver/render/mitri.c 18 Apr 2006 22:34:08 -0000 +@@ -145,7 +145,7 @@ + if (npoint < 3) + return; + ntri = npoint - 2; +- tris = ALLOCATE_LOCAL (ntri & sizeof (xTriangle)); ++ tris = ALLOCATE_LOCAL (ntri * sizeof (xTriangle)); + if (!tris) + return; + for (tri = tris; npoint >= 3; npoint--, points++, tri++) +@@ -177,7 +177,7 @@ + if (npoint < 3) + return; + ntri = npoint - 2; +- tris = ALLOCATE_LOCAL (ntri & sizeof (xTriangle)); ++ tris = ALLOCATE_LOCAL (ntri * sizeof (xTriangle)); + if (!tris) + return; + first = points++; |