diff options
| author | drochner <drochner> | 2007-08-02 14:41:18 +0000 |
|---|---|---|
| committer | drochner <drochner> | 2007-08-02 14:41:18 +0000 |
| commit | 1bc02e89de5d3bc1f332ca8a3940870f1685ff52 (patch) | |
| tree | 4243d031eb744eb78c45b6debb9a2a88269fa6bb /print | |
| parent | e545f4e3bcc9663486e3f2f08c0ebb21d4be034c (diff) | |
| download | pkgsrc-1bc02e89de5d3bc1f332ca8a3940870f1685ff52.tar.gz | |
apply a patch from xpdf to fix an integer overflow vulnerability
(CVE-2007-3387)
bump PKGREVISION
Diffstat (limited to 'print')
| -rw-r--r-- | print/poppler/Makefile | 4 | ||||
| -rw-r--r-- | print/poppler/distinfo | 3 | ||||
| -rw-r--r-- | print/poppler/patches/patch-af | 30 |
3 files changed, 34 insertions, 3 deletions
diff --git a/print/poppler/Makefile b/print/poppler/Makefile index dba23f18619..691f1a51b60 100644 --- a/print/poppler/Makefile +++ b/print/poppler/Makefile @@ -1,9 +1,9 @@ -# $NetBSD: Makefile,v 1.20 2007/01/17 15:53:09 drochner Exp $ +# $NetBSD: Makefile,v 1.21 2007/08/02 14:41:18 drochner Exp $ # .include "../../print/poppler/Makefile.common" -PKGREVISION= 1 +PKGREVISION= 2 COMMENT= PDF rendering library diff --git a/print/poppler/distinfo b/print/poppler/distinfo index 3eb722942ae..778c575dc34 100644 --- a/print/poppler/distinfo +++ b/print/poppler/distinfo @@ -1,4 +1,4 @@ -$NetBSD: distinfo,v 1.16 2007/01/17 15:53:09 drochner Exp $ +$NetBSD: distinfo,v 1.17 2007/08/02 14:41:18 drochner Exp $ SHA1 (poppler-0.5.4.tar.gz) = edf4e4ff17ef86a7f60f097949ad7db53fa2c3b1 RMD160 (poppler-0.5.4.tar.gz) = f28c89b03388757067505df3c60a1d878626b0dd @@ -8,3 +8,4 @@ SHA1 (patch-ab) = 5ff54831e530c857b88f90c91108d1a04178579e SHA1 (patch-ac) = ba2f2e83897e4c56541da6e9e4f1b61d60fea9b0 SHA1 (patch-ad) = 437c1514654d3c4caa00f674de9dbd3d66e58127 SHA1 (patch-ae) = 9f118e4d70df1c523807aa5faeda798a3d7f74f1 +SHA1 (patch-af) = e27499a90ebf76f376a411e310fe16c21d22f30e diff --git a/print/poppler/patches/patch-af b/print/poppler/patches/patch-af new file mode 100644 index 00000000000..757924ba8df --- /dev/null +++ b/print/poppler/patches/patch-af @@ -0,0 +1,30 @@ +$NetBSD: patch-af,v 1.1 2007/08/02 14:41:19 drochner Exp $ + +--- poppler/Stream.cc.orig 2007-08-02 10:28:59.000000000 +0200 ++++ poppler/Stream.cc +@@ -422,12 +422,6 @@ StreamPredictor::StreamPredictor(Stream + 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; +- } + totalBits = nVals * nBits; + if (totalBits == 0 || + (totalBits / nBits) / nComps != width || +@@ -436,7 +430,11 @@ StreamPredictor::StreamPredictor(Stream + } + pixBytes = (nComps * nBits + 7) >> 3; + rowBytes = ((totalBits + 7) >> 3) + pixBytes; +- if (rowBytes < 0) { ++ 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); |