From owner-svn-ports-head@freebsd.org Mon Aug 24 16:25:23 2015 Return-Path: Delivered-To: svn-ports-head@mailman.ysv.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:1900:2254:206a::19:1]) by mailman.ysv.freebsd.org (Postfix) with ESMTP id 761A09C2115; Mon, 24 Aug 2015 16:25:23 +0000 (UTC) (envelope-from feld@FreeBSD.org) Received: from repo.freebsd.org (repo.freebsd.org [IPv6:2001:1900:2254:2068::e6a:0]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client did not present a certificate) by mx1.freebsd.org (Postfix) with ESMTPS id 4C35F1138; Mon, 24 Aug 2015 16:25:23 +0000 (UTC) (envelope-from feld@FreeBSD.org) Received: from repo.freebsd.org ([127.0.1.70]) by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id t7OGPNdK017590; Mon, 24 Aug 2015 16:25:23 GMT (envelope-from feld@FreeBSD.org) Received: (from feld@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id t7OGPMFP017588; Mon, 24 Aug 2015 16:25:22 GMT (envelope-from feld@FreeBSD.org) Message-Id: <201508241625.t7OGPMFP017588@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: feld set sender to feld@FreeBSD.org using -f From: Mark Felder Date: Mon, 24 Aug 2015 16:25:22 +0000 (UTC) To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org Subject: svn commit: r395178 - in head/devel/pcre: . files X-SVN-Group: ports-head 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.20 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: Mon, 24 Aug 2015 16:25:23 -0000 Author: feld Date: Mon Aug 24 16:25:22 2015 New Revision: 395178 URL: https://svnweb.freebsd.org/changeset/ports/395178 Log: devel/pcre: Add patch to resolve heap overflow vulnerability Obtained from: http://vcs.pcre.org/pcre?view=revision&revision=1594 Security: 6900e6f1-4a79-11e5-9ad8-14dae9d210b8 Added: head/devel/pcre/files/patch-r1594-heap-overflow (contents, props changed) Modified: head/devel/pcre/Makefile Modified: head/devel/pcre/Makefile ============================================================================== --- head/devel/pcre/Makefile Mon Aug 24 16:10:57 2015 (r395177) +++ head/devel/pcre/Makefile Mon Aug 24 16:25:22 2015 (r395178) @@ -3,7 +3,7 @@ PORTNAME= pcre PORTVERSION= 8.37 -PORTREVISION= 3 +PORTREVISION= 4 CATEGORIES= devel MASTER_SITES= SF/${PORTNAME}/${PORTNAME}/${PORTVERSION} \ ftp://ftp.csx.cam.ac.uk/pub/software/programming/${PORTNAME}/ \ Added: head/devel/pcre/files/patch-r1594-heap-overflow ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ head/devel/pcre/files/patch-r1594-heap-overflow Mon Aug 24 16:25:22 2015 (r395178) @@ -0,0 +1,20 @@ +--- pcre_compile.c 2015/08/14 09:34:32 1593 ++++ pcre_compile.c 2015/08/21 16:08:33 1594 +@@ -7238,7 +7238,7 @@ + encountered. In that case, we allow yet more memory, just in case. + (Again, this is fixed "properly" in PCRE2. */ + +- if (cd->dupgroups) *lengthptr += 2 + 2*LINK_SIZE; ++ if (cd->dupgroups) *lengthptr += 4 + 4*LINK_SIZE; + + /* Otherwise, check for recursion here. The name table does not exist + in the first pass; instead we must scan the list of names encountered +@@ -9474,7 +9474,7 @@ + "const" attribute if the cast (pcre_uchar *)codestart is used directly in the + function call. */ + +-if ((options & PCRE_NO_AUTO_POSSESS) == 0) ++if (errorcode == 0 && (options & PCRE_NO_AUTO_POSSESS) == 0) + { + pcre_uchar *temp = (pcre_uchar *)codestart; + auto_possessify(temp, utf, cd);