From owner-svn-src-head@freebsd.org  Fri Jul  7 22:00:40 2017
Return-Path: <owner-svn-src-head@freebsd.org>
Delivered-To: svn-src-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 A6FCDDAC5B9;
 Fri,  7 Jul 2017 22:00:40 +0000 (UTC)
 (envelope-from kevans@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 73ADE64C01;
 Fri,  7 Jul 2017 22:00:40 +0000 (UTC)
 (envelope-from kevans@FreeBSD.org)
Received: from repo.freebsd.org ([127.0.1.37])
 by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id v67M0d7U029236;
 Fri, 7 Jul 2017 22:00:39 GMT (envelope-from kevans@FreeBSD.org)
Received: (from kevans@localhost)
 by repo.freebsd.org (8.15.2/8.15.2/Submit) id v67M0dl8029235;
 Fri, 7 Jul 2017 22:00:39 GMT (envelope-from kevans@FreeBSD.org)
Message-Id: <201707072200.v67M0dl8029235@repo.freebsd.org>
X-Authentication-Warning: repo.freebsd.org: kevans set sender to
 kevans@FreeBSD.org using -f
From: Kyle Evans <kevans@FreeBSD.org>
Date: Fri, 7 Jul 2017 22:00:39 +0000 (UTC)
To: src-committers@freebsd.org, svn-src-all@freebsd.org,
 svn-src-head@freebsd.org
Subject: svn commit: r320796 - head/lib/libc/regex
X-SVN-Group: head
X-SVN-Commit-Author: kevans
X-SVN-Commit-Paths: head/lib/libc/regex
X-SVN-Commit-Revision: 320796
X-SVN-Commit-Repository: base
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
X-BeenThere: svn-src-head@freebsd.org
X-Mailman-Version: 2.1.23
Precedence: list
List-Id: SVN commit messages for the src tree for head/-current
 <svn-src-head.freebsd.org>
List-Unsubscribe: <https://lists.freebsd.org/mailman/options/svn-src-head>,
 <mailto:svn-src-head-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/svn-src-head/>
List-Post: <mailto:svn-src-head@freebsd.org>
List-Help: <mailto:svn-src-head-request@freebsd.org?subject=help>
List-Subscribe: <https://lists.freebsd.org/mailman/listinfo/svn-src-head>,
 <mailto:svn-src-head-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Fri, 07 Jul 2017 22:00:40 -0000

Author: kevans
Date: Fri Jul  7 22:00:39 2017
New Revision: 320796
URL: https://svnweb.freebsd.org/changeset/base/320796

Log:
  Correctly ignore branch operators in the top-level parser when applicable.
  
  An oversight in r320742 caused BREs to become sensitive to the branching operator prematurely, which caused
  breakage in some limited situations -- namely, those that tried to use branching in a BRE. Most of these scenarios
  had already been corrected beforehand to properly use gsed or grep for GNU extensions, so the damage is
  slightly mitigated.
  
  Reported by: antoine
  
  Reported by:	antoine
  Approved by:	emaste (mentor)
  Differential Revision:	https://reviews.freebsd.org/D11522

Modified:
  head/lib/libc/regex/regcomp.c

Modified: head/lib/libc/regex/regcomp.c
==============================================================================
--- head/lib/libc/regex/regcomp.c	Fri Jul  7 21:33:06 2017	(r320795)
+++ head/lib/libc/regex/regcomp.c	Fri Jul  7 22:00:39 2017	(r320796)
@@ -672,7 +672,7 @@ p_re(struct parse *p,
 		bc.terminate = false;
 		if (p->pre_parse != NULL)
 			p->pre_parse(p, &bc);
-		while (MORE() && !SEESPEC('|') && !SEEEND()) {
+		while (MORE() && (!p->allowbranch || !SEESPEC('|')) && !SEEEND()) {
 			bc.terminate = p->parse_expr(p, &bc);
 			++bc.nchain;
 		}