From owner-svn-ports-head@freebsd.org Fri Oct 4 22:12:45 2019 Return-Path: Delivered-To: svn-ports-head@mailman.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mailman.nyi.freebsd.org (Postfix) with ESMTP id 144A813AD52; Fri, 4 Oct 2019 22:12:45 +0000 (UTC) (envelope-from cy@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) server-signature RSA-PSS (4096 bits) client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "Let's Encrypt Authority X3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 46lPJD5MvNz3RGb; Fri, 4 Oct 2019 22:12:44 +0000 (UTC) (envelope-from cy@FreeBSD.org) Received: from repo.freebsd.org (repo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:0]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 9101A2E90; Fri, 4 Oct 2019 22:12:44 +0000 (UTC) (envelope-from cy@FreeBSD.org) Received: from repo.freebsd.org ([127.0.1.37]) by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id x94MCiqV081445; Fri, 4 Oct 2019 22:12:44 GMT (envelope-from cy@FreeBSD.org) Received: (from cy@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id x94MCiP2081442; Fri, 4 Oct 2019 22:12:44 GMT (envelope-from cy@FreeBSD.org) Message-Id: <201910042212.x94MCiP2081442@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: cy set sender to cy@FreeBSD.org using -f From: Cy Schubert Date: Fri, 4 Oct 2019 22:12:44 +0000 (UTC) To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org Subject: svn commit: r513786 - in head/graphics/xpdf3: . files X-SVN-Group: ports-head X-SVN-Commit-Author: cy X-SVN-Commit-Paths: in head/graphics/xpdf3: . files X-SVN-Commit-Revision: 513786 X-SVN-Commit-Repository: ports MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-ports-head@freebsd.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: SVN commit messages for the ports tree for head List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Fri, 04 Oct 2019 22:12:45 -0000 Author: cy Date: Fri Oct 4 22:12:43 2019 New Revision: 513786 URL: https://svnweb.freebsd.org/changeset/ports/513786 Log: Backport fix for CVE-2019-16927 and CVE-2019-9877 from xpdf4. PR: 241066 Submitted by: naddy MFH: 2019Q4 Added: head/graphics/xpdf3/files/patch-xpdf_TextOutputDev.cc (contents, props changed) Modified: head/graphics/xpdf3/Makefile (contents, props changed) Modified: head/graphics/xpdf3/Makefile ============================================================================== --- head/graphics/xpdf3/Makefile Fri Oct 4 22:12:40 2019 (r513785) +++ head/graphics/xpdf3/Makefile Fri Oct 4 22:12:43 2019 (r513786) @@ -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) Added: head/graphics/xpdf3/files/patch-xpdf_TextOutputDev.cc ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ head/graphics/xpdf3/files/patch-xpdf_TextOutputDev.cc Fri Oct 4 22:12:43 2019 (r513786) @@ -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;