Backport fix for CVE-2019-16927 and CVE-2019-9877 from xpdf4.

PR:		241066
Submitted by:	naddy
MFH:		2019Q4
This commit is contained in:
Cy Schubert 2019-10-04 22:12:43 +00:00
parent b12bd2b2ae
commit 81b95851cf
Notes: svn2git 2021-03-31 03:12:20 +00:00
svn path=/head/; revision=513786
2 changed files with 16 additions and 1 deletions

View file

@ -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)

View file

@ -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;