From owner-svn-ports-all@freebsd.org Wed May 2 23:30:10 2018 Return-Path: Delivered-To: svn-ports-all@mailman.ysv.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mailman.ysv.freebsd.org (Postfix) with ESMTP id D9210FB7510; Wed, 2 May 2018 23:30:10 +0000 (UTC) (envelope-from jbeich@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client CN "mxrelay.nyi.freebsd.org", Issuer "Let's Encrypt Authority X3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 78C2A825EF; Wed, 2 May 2018 23:30:10 +0000 (UTC) (envelope-from jbeich@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 69D76179BD; Wed, 2 May 2018 23:30:10 +0000 (UTC) (envelope-from jbeich@FreeBSD.org) Received: from repo.freebsd.org ([127.0.1.37]) by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id w42NUAgv055888; Wed, 2 May 2018 23:30:10 GMT (envelope-from jbeich@FreeBSD.org) Received: (from jbeich@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id w42NUA17055886; Wed, 2 May 2018 23:30:10 GMT (envelope-from jbeich@FreeBSD.org) Message-Id: <201805022330.w42NUA17055886@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: jbeich set sender to jbeich@FreeBSD.org using -f From: Jan Beich Date: Wed, 2 May 2018 23:30:10 +0000 (UTC) To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-branches@freebsd.org Subject: svn commit: r468891 - in branches/2018Q2/print/freetype2: . files X-SVN-Group: ports-branches X-SVN-Commit-Author: jbeich X-SVN-Commit-Paths: in branches/2018Q2/print/freetype2: . files X-SVN-Commit-Revision: 468891 X-SVN-Commit-Repository: ports MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-ports-all@freebsd.org X-Mailman-Version: 2.1.25 Precedence: list List-Id: SVN commit messages for the ports tree List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Wed, 02 May 2018 23:30:11 -0000 Author: jbeich Date: Wed May 2 23:30:09 2018 New Revision: 468891 URL: https://svnweb.freebsd.org/changeset/ports/468891 Log: print/freetype2: apply CVE-2018-6942 fix PR: 227568 Submitted by: lightside@gmx.com Obtained from: upstream (freetype 2.9.1) Approved by: ports-secteam blanket Added: branches/2018Q2/print/freetype2/files/patch-CVE-2018-6942 (contents, props changed) Modified: branches/2018Q2/print/freetype2/Makefile Modified: branches/2018Q2/print/freetype2/Makefile ============================================================================== --- branches/2018Q2/print/freetype2/Makefile Wed May 2 22:23:21 2018 (r468890) +++ branches/2018Q2/print/freetype2/Makefile Wed May 2 23:30:09 2018 (r468891) @@ -3,7 +3,7 @@ PORTNAME= freetype2 PORTVERSION= 2.8 -PORTREVISION= 1 +PORTREVISION= 2 CATEGORIES= print MASTER_SITES= http://savannah.nongnu.org/download/freetype/ \ SF/freetype/${PORTNAME}/${PORTVERSION:C/^([0-9]+\.[0-9]+\.[0-9]+).*/\1/}/ \ Added: branches/2018Q2/print/freetype2/files/patch-CVE-2018-6942 ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ branches/2018Q2/print/freetype2/files/patch-CVE-2018-6942 Wed May 2 23:30:09 2018 (r468891) @@ -0,0 +1,24 @@ +# * src/truetype/ttinterp.c (Ins_GETVARIATION): Avoid NULL reference. +# https://git.savannah.gnu.org/cgit/freetype/freetype2.git/commit/?id=29c759284e305ec428703c9a5831d0b1fc3497ef + +--- src/truetype/ttinterp.c.orig 2017-05-03 21:42:13 UTC ++++ src/truetype/ttinterp.c +@@ -7470,8 +7470,16 @@ + return; + } + +- for ( i = 0; i < num_axes; i++ ) +- args[i] = coords[i] >> 2; /* convert 16.16 to 2.14 format */ ++ if ( coords ) ++ { ++ for ( i = 0; i < num_axes; i++ ) ++ args[i] = coords[i] >> 2; /* convert 16.16 to 2.14 format */ ++ } ++ else ++ { ++ for ( i = 0; i < num_axes; i++ ) ++ args[i] = 0; ++ } + } + +