diff options
| author | Cy Schubert <cy@FreeBSD.org> | 2019-10-04 22:12:43 +0000 |
|---|---|---|
| committer | Cy Schubert <cy@FreeBSD.org> | 2019-10-04 22:12:43 +0000 |
| commit | 81b95851cf5239c14125cfc3c035bb824c2820f2 (patch) | |
| tree | bb295d91fc65f419207a8ce7bc7c7635e23ee38f /graphics/xpdf3 | |
| parent | b12bd2b2ae6f8386bfc274f18184e3a8ae4fade1 (diff) | |
| download | ports-81b95851cf5239c14125cfc3c035bb824c2820f2.tar.gz ports-81b95851cf5239c14125cfc3c035bb824c2820f2.zip | |
Backport fix for CVE-2019-16927 and CVE-2019-9877 from xpdf4.
PR: 241066
Submitted by: naddy
MFH: 2019Q4
Notes
Notes:
svn path=/head/; revision=513786
Diffstat (limited to 'graphics/xpdf3')
| -rw-r--r-- | graphics/xpdf3/Makefile | 2 | ||||
| -rw-r--r-- | graphics/xpdf3/files/patch-xpdf_TextOutputDev.cc | 15 |
2 files changed, 16 insertions, 1 deletions
diff --git a/graphics/xpdf3/Makefile b/graphics/xpdf3/Makefile index 459fcecc5b32..6fafbe7d1809 100644 --- a/graphics/xpdf3/Makefile +++ b/graphics/xpdf3/Makefile @@ -2,7 +2,7 @@ PORTNAME= xpdf PORTVERSION= 3.04 -PORTREVISION= 10 +PORTREVISION= 11 CATEGORIES= graphics print MASTER_SITES= https://xpdfreader-dl.s3.amazonaws.com/old/ .if !defined(MASTERDIR) diff --git a/graphics/xpdf3/files/patch-xpdf_TextOutputDev.cc b/graphics/xpdf3/files/patch-xpdf_TextOutputDev.cc new file mode 100644 index 000000000000..fa6976d9fb32 --- /dev/null +++ b/graphics/xpdf3/files/patch-xpdf_TextOutputDev.cc @@ -0,0 +1,15 @@ +--- xpdf/TextOutputDev.cc.orig 2019-10-04 19:39:06 UTC ++++ xpdf/TextOutputDev.cc +@@ -2472,6 +2472,12 @@ TextBlock *TextPage::split(GList *charsA, int rot) { + + //----- compute the horizontal and vertical profiles + ++ if (xMin / splitPrecision < 0.5 * INT_MIN || ++ xMax / splitPrecision > 0.5 * INT_MAX || ++ yMin / splitPrecision < 0.5 * INT_MIN || ++ xMax / splitPrecision > 0.5 * INT_MAX) { ++ return NULL; ++ } + // add some slack to the array bounds to avoid floating point + // precision problems + xMinI = (int)floor(xMin / splitPrecision) - 1; |