diff options
author | Stanislav Sedov <stas@FreeBSD.org> | 2009-04-28 21:27:53 +0000 |
---|---|---|
committer | Stanislav Sedov <stas@FreeBSD.org> | 2009-04-28 21:27:53 +0000 |
commit | 55f4951c76bd0c78f7562c4fc68d5bb4d182832d (patch) | |
tree | c81f63631dde0f3404cfd2a429d74dc98ad217ed /textproc/pdftohtml | |
parent | 6a0056b9a72477fccf3434549329e6654e60287b (diff) | |
download | ports-55f4951c76bd0c78f7562c4fc68d5bb4d182832d.tar.gz ports-55f4951c76bd0c78f7562c4fc68d5bb4d182832d.zip |
- Fix CVE-2007-3387.
- Bump portrevision.
Submitted by: Vladislav Sekulic Sys POC <pocsys@cs.toronto.edu> (based on)
Approved by: secteam blanket
Security: http://www.FreeBSD.org/ports/portaudit/0e43a14d-3f3f-11dc-a79a-0016179b2dd5.html
Notes
Notes:
svn path=/head/; revision=232918
Diffstat (limited to 'textproc/pdftohtml')
-rw-r--r-- | textproc/pdftohtml/Makefile | 2 | ||||
-rw-r--r-- | textproc/pdftohtml/files/patch-cve-2007-3387 | 22 |
2 files changed, 23 insertions, 1 deletions
diff --git a/textproc/pdftohtml/Makefile b/textproc/pdftohtml/Makefile index 7899b7536bbc..ba7a3fe5604c 100644 --- a/textproc/pdftohtml/Makefile +++ b/textproc/pdftohtml/Makefile @@ -8,7 +8,7 @@ PORTNAME= pdftohtml PORTVERSION= 0.39 -PORTREVISION= 2 +PORTREVISION= 3 CATEGORIES= textproc MASTER_SITES= ${MASTER_SITE_SOURCEFORGE} MASTER_SITE_SUBDIR= ${PORTNAME} diff --git a/textproc/pdftohtml/files/patch-cve-2007-3387 b/textproc/pdftohtml/files/patch-cve-2007-3387 new file mode 100644 index 000000000000..573487ee06df --- /dev/null +++ b/textproc/pdftohtml/files/patch-cve-2007-3387 @@ -0,0 +1,22 @@ +--- xpdf/Stream.cc.orig 2009-04-29 01:11:24.000000000 +0400 ++++ xpdf/Stream.cc 2009-04-29 01:15:47.000000000 +0400 +@@ -33,6 +33,7 @@ + #include "JBIG2Stream.h" + #include "JPXStream.h" + #include "Stream-CCITT.h" ++#include "Function.h" + + #ifdef __DJGPP__ + static GBool setDJSYSFLAGS = gFalse; +@@ -417,8 +418,9 @@ + ok = gFalse; + + if (width <= 0 || nComps <= 0 || nBits <= 0 || +- nComps >= INT_MAX/nBits || +- width >= INT_MAX/nComps/nBits) { ++ nComps > funcMaxOutputs || nBits > 16 || ++ width >= INT_MAX / nComps || ++ nVals >= (INT_MAX - 7) / nBits) { + return; + } + nVals = width * nComps; |