1
0
mirror of https://git.FreeBSD.org/ports.git synced 2024-11-23 00:43:28 +00:00

Patch vulnerability in imported xpdf code. Bump PORTREVISION.

Approved by:	pav(mentor, gnome hat)
References:	http://www.vuxml.org/freebsd/e3e266e9-5473-11d9-a9e7-0001020eed82.html
This commit is contained in:
Josef El-Rayes 2004-12-24 19:32:52 +00:00
parent 97e70a0bfe
commit c1c784df06
Notes: svn2git 2021-03-31 03:12:20 +00:00
svn path=/head/; revision=125088
2 changed files with 37 additions and 0 deletions

View File

@ -7,6 +7,7 @@
PORTNAME= gpdf
PORTVERSION= 2.8.1
PORTREVISION= 1
CATEGORIES= graphics print gnome
MASTER_SITES= ${MASTER_SITE_GNOME}
MASTER_SITE_SUBDIR= sources/${PORTNAME}/2.8

View File

@ -0,0 +1,36 @@
--- xpdf/Gfx.cc Mon May 17 21:37:57 2004
+++ xpdf/Gfx.cc Fri Dec 24 17:01:42 2004
@@ -2654,7 +2654,9 @@
haveMask = gFalse;
dict->lookup("Mask", &maskObj);
if (maskObj.isArray()) {
- for (i = 0; i < maskObj.arrayGetLength(); ++i) {
+ for (i = 0;
+ i < maskObj.arrayGetLength() && i < 2*gfxColorMaxComps;
+ ++i) {
maskObj.arrayGet(i, &obj1);
maskColors[i] = obj1.getInt();
obj1.free();
--- xpdf/GfxState.cc Mon May 17 21:37:57 2004
+++ xpdf/GfxState.cc Fri Dec 24 17:01:42 2004
@@ -714,6 +714,11 @@
}
nCompsA = obj2.getInt();
obj2.free();
+ if (nCompsA > gfxColorMaxComps) {
+ error(-1, "ICCBased color space with too many (%d > %d) components",
+ nCompsA, gfxColorMaxComps);
+ nCompsA = gfxColorMaxComps;
+ }
if (dict->lookup("Alternate", &obj2)->isNull() ||
!(altA = GfxColorSpace::parse(&obj2))) {
switch (nCompsA) {
@@ -1060,7 +1065,7 @@
}
nCompsA = obj1.arrayGetLength();
if (nCompsA > gfxColorMaxComps) {
- error(-1, "DeviceN color space with more than %d > %d components",
+ error(-1, "DeviceN color space with too many (%d > %d) components",
nCompsA, gfxColorMaxComps);
nCompsA = gfxColorMaxComps;
}