diff options
| author | Xin LI <delphij@FreeBSD.org> | 2007-11-13 01:14:28 +0000 |
|---|---|---|
| committer | Xin LI <delphij@FreeBSD.org> | 2007-11-13 01:14:28 +0000 |
| commit | 7f0ec7cb1bc111bad9ac389d515e6ec2b522959a (patch) | |
| tree | 123e18f2850aac3cefbe4d3df0b0c3afa6a94224 /graphics/xpdf | |
| parent | 85f68acbb6387b5bfbfff94e0208c2184ee67a93 (diff) | |
Notes
Diffstat (limited to 'graphics/xpdf')
| -rw-r--r-- | graphics/xpdf/Makefile | 4 | ||||
| -rw-r--r-- | graphics/xpdf/distinfo | 6 | ||||
| -rw-r--r-- | graphics/xpdf/files/patch-CVE-2007-3387 | 33 |
3 files changed, 8 insertions, 35 deletions
diff --git a/graphics/xpdf/Makefile b/graphics/xpdf/Makefile index 56ca27646383..69497552b9cc 100644 --- a/graphics/xpdf/Makefile +++ b/graphics/xpdf/Makefile @@ -7,14 +7,14 @@ PORTNAME= xpdf PORTVERSION= 3.02 -PORTREVISION= 4 +PORTREVISION= 5 CATEGORIES= graphics print MASTER_SITES= ftp://ftp.foolabs.com/pub/xpdf/ \ ${MASTER_SITE_TEX_CTAN} MASTER_SITE_SUBDIR= support/xpdf PATCH_SITES= ftp://ftp.foolabs.com/pub/xpdf/ -PATCHFILES= +PATCHFILES= xpdf-3.02pl1.patch xpdf-3.02pl2.patch PATCH_DIST_STRIP= -p1 MAINTAINER= nork@FreeBSD.org diff --git a/graphics/xpdf/distinfo b/graphics/xpdf/distinfo index d8e18fa8c496..75993c883f20 100644 --- a/graphics/xpdf/distinfo +++ b/graphics/xpdf/distinfo @@ -1,3 +1,9 @@ MD5 (xpdf-3.02.tar.gz) = 599dc4cc65a07ee868cf92a667a913d2 SHA256 (xpdf-3.02.tar.gz) = b33a7d56f454c331ae50996f989e86c9166e57af97b74de28cddf3d51ac11f00 SIZE (xpdf-3.02.tar.gz) = 674912 +MD5 (xpdf-3.02pl1.patch) = 877118786dfe27d1b7aa5a6759cc6e45 +SHA256 (xpdf-3.02pl1.patch) = 58f613b00b414a86aa776b76fcd899bb415e4ee4edc2184c8a7c4ed1004dbbf3 +SIZE (xpdf-3.02pl1.patch) = 1050 +MD5 (xpdf-3.02pl2.patch) = 3a5cb165ae66781e0b21e6219ae06795 +SHA256 (xpdf-3.02pl2.patch) = d1c1d887b0b8a5283f04f825e44f085f2e92daf7b518889acf1bc89ea07ed9d9 +SIZE (xpdf-3.02pl2.patch) = 20843 diff --git a/graphics/xpdf/files/patch-CVE-2007-3387 b/graphics/xpdf/files/patch-CVE-2007-3387 deleted file mode 100644 index 692d243ab949..000000000000 --- a/graphics/xpdf/files/patch-CVE-2007-3387 +++ /dev/null @@ -1,33 +0,0 @@ -*** xpdf/Stream.cc Tue Feb 27 14:05:52 2007 ---- xpdf/Stream.cc Thu Jul 26 14:44:43 2007 -*************** -*** 410,424 **** - ok = gFalse; - - nVals = width * nComps; -- if (width <= 0 || nComps <= 0 || nBits <= 0 || -- nComps >= INT_MAX / nBits || -- width >= INT_MAX / nComps / nBits || -- nVals * nBits + 7 < 0) { -- return; -- } - pixBytes = (nComps * nBits + 7) >> 3; - rowBytes = ((nVals * nBits + 7) >> 3) + pixBytes; -! if (rowBytes <= 0) { - return; - } - predLine = (Guchar *)gmalloc(rowBytes); ---- 410,422 ---- - ok = gFalse; - - nVals = width * nComps; - pixBytes = (nComps * nBits + 7) >> 3; - rowBytes = ((nVals * nBits + 7) >> 3) + pixBytes; -! if (width <= 0 || nComps <= 0 || nBits <= 0 || -! nComps > gfxColorMaxComps || -! nBits > 16 || -! width >= INT_MAX / nComps || // check for overflow in nVals -! nVals >= (INT_MAX - 7) / nBits) { // check for overflow in rowBytes - return; - } - predLine = (Guchar *)gmalloc(rowBytes); |