From owner-svn-ports-all@freebsd.org Mon Mar 21 02:34:51 2016 Return-Path: Delivered-To: svn-ports-all@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 E1860AD6097; Mon, 21 Mar 2016 02:34:51 +0000 (UTC) (envelope-from feld@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 mx1.freebsd.org (Postfix) with ESMTPS id 950C3115; Mon, 21 Mar 2016 02:34:51 +0000 (UTC) (envelope-from feld@FreeBSD.org) Received: from repo.freebsd.org ([127.0.1.37]) by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id u2L2YomV077870; Mon, 21 Mar 2016 02:34:50 GMT (envelope-from feld@FreeBSD.org) Received: (from feld@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id u2L2YoKO077868; Mon, 21 Mar 2016 02:34:50 GMT (envelope-from feld@FreeBSD.org) Message-Id: <201603210234.u2L2YoKO077868@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: feld set sender to feld@FreeBSD.org using -f From: Mark Felder Date: Mon, 21 Mar 2016 02:34:50 +0000 (UTC) To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org Subject: svn commit: r411530 - in head/devel/pcre2: . 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-all@freebsd.org X-Mailman-Version: 2.1.21 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: Mon, 21 Mar 2016 02:34:52 -0000 Author: feld Date: Mon Mar 21 02:34:50 2016 New Revision: 411530 URL: https://svnweb.freebsd.org/changeset/ports/411530 Log: devel/pcre2: Add patch to resolve CVE PR: 208167 Obtained from: PCRE svn (r489) Security: CVE-2016-3191 Added: head/devel/pcre2/files/patch-CVE-2016-3191 (contents, props changed) Modified: head/devel/pcre2/Makefile Modified: head/devel/pcre2/Makefile ============================================================================== --- head/devel/pcre2/Makefile Mon Mar 21 02:32:27 2016 (r411529) +++ head/devel/pcre2/Makefile Mon Mar 21 02:34:50 2016 (r411530) @@ -3,7 +3,7 @@ PORTNAME= pcre2 PORTVERSION= 10.20 -PORTREVISION= 0 +PORTREVISION= 1 CATEGORIES= devel MASTER_SITES= SF/pcre/${PORTNAME}/${PORTVERSION} \ ftp://ftp.csx.cam.ac.uk/pub/software/programming/pcre/ \ Added: head/devel/pcre2/files/patch-CVE-2016-3191 ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ head/devel/pcre2/files/patch-CVE-2016-3191 Mon Mar 21 02:34:50 2016 (r411530) @@ -0,0 +1,27 @@ +--- src/pcre2_compile.c 2016/02/06 16:40:59 488 ++++ src/pcre2_compile.c 2016/02/10 18:24:02 489 +@@ -5901,10 +5901,22 @@ + goto FAILED; + } + cb->had_accept = TRUE; ++ ++ /* In the first pass, just accumulate the length required; ++ otherwise hitting (*ACCEPT) inside many nested parentheses can ++ cause workspace overflow. */ ++ + for (oc = cb->open_caps; oc != NULL; oc = oc->next) + { +- *code++ = OP_CLOSE; +- PUT2INC(code, 0, oc->number); ++ if (lengthptr != NULL) ++ { ++ *lengthptr += CU2BYTES(1) + IMM2_SIZE; ++ } ++ else ++ { ++ *code++ = OP_CLOSE; ++ PUT2INC(code, 0, oc->number); ++ } + } + setverb = *code++ = + (cb->assert_depth > 0)? OP_ASSERT_ACCEPT : OP_ACCEPT;