diff options
| author | josef <josef@FreeBSD.org> | 2004-12-25 07:17:44 +0800 |
|---|---|---|
| committer | josef <josef@FreeBSD.org> | 2004-12-25 07:17:44 +0800 |
| commit | 56f814e21105c96b42078f4fcffc528d24c6c392 (patch) | |
| tree | 5e5873496b61885091f931282067ff5fd39c727a /print | |
| parent | b5487b9a7e8dd8677ba0abd4b2e67e4bc6936d80 (diff) | |
| download | freebsd-ports-gnome-56f814e21105c96b42078f4fcffc528d24c6c392.tar.gz freebsd-ports-gnome-56f814e21105c96b42078f4fcffc528d24c6c392.tar.zst freebsd-ports-gnome-56f814e21105c96b42078f4fcffc528d24c6c392.zip | |
Patch vulnerability in imported xpdf code. Bump PORTREVISION.
Approved by: pav(mentor)
With hat: secteam
References:
http://www.vuxml.org/freebsd/e3e266e9-5473-11d9-a9e7-0001020eed82.html
Diffstat (limited to 'print')
| -rw-r--r-- | print/cups-base/Makefile | 2 | ||||
| -rw-r--r-- | print/cups-base/files/patch-pdftops-Gfx.cc | 29 |
2 files changed, 30 insertions, 1 deletions
diff --git a/print/cups-base/Makefile b/print/cups-base/Makefile index 0c6d23c176e2..8f8b1b8136d1 100644 --- a/print/cups-base/Makefile +++ b/print/cups-base/Makefile @@ -9,7 +9,7 @@ PORTNAME= cups-base PORTVERSION= ${CUPS_PORTVER} -PORTREVISION= ${CUPS_PORTREV} +PORTREVISION= 1 PORTEPOCH= ${CUPS_PORTEPOCH} CATEGORIES= print MASTER_SITES= ${CUPS_MASTER_SITES} diff --git a/print/cups-base/files/patch-pdftops-Gfx.cc b/print/cups-base/files/patch-pdftops-Gfx.cc new file mode 100644 index 000000000000..5ec60d90d8c1 --- /dev/null +++ b/print/cups-base/files/patch-pdftops-Gfx.cc @@ -0,0 +1,29 @@ +diff -ruN pdftops/Gfx.cxx /home/josef//temp/pdftops/Gfx.cxx +--- pdftops/Gfx.cxx Fri Apr 9 22:18:31 2004 ++++ /home/josef//temp/pdftops/Gfx.cxx Fri Dec 24 20:21:32 2004 +@@ -2655,7 +2655,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(); +diff -ruN pdftops/GfxState.cxx /home/josef//temp/pdftops/GfxState.cxx +--- pdftops/GfxState.cxx Mon Feb 2 23:41:09 2004 ++++ /home/josef//temp/pdftops/GfxState.cxx Fri Dec 24 20:21:32 2004 +@@ -708,6 +708,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) { |