From owner-svn-src-all@FreeBSD.ORG  Thu Nov 20 19:35:29 2014
Return-Path: <owner-svn-src-all@FreeBSD.ORG>
Delivered-To: svn-src-all@freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org
 [IPv6:2001:1900:2254:206a::19:1])
 (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits))
 (No client certificate requested)
 by hub.freebsd.org (Postfix) with ESMTPS id DD97D49B;
 Thu, 20 Nov 2014 19:35:29 +0000 (UTC)
Received: from svn.freebsd.org (svn.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 C99B2DA;
 Thu, 20 Nov 2014 19:35:29 +0000 (UTC)
Received: from svn.freebsd.org ([127.0.1.70])
 by svn.freebsd.org (8.14.9/8.14.9) with ESMTP id sAKJZT9N012735;
 Thu, 20 Nov 2014 19:35:29 GMT (envelope-from emaste@FreeBSD.org)
Received: (from emaste@localhost)
 by svn.freebsd.org (8.14.9/8.14.9/Submit) id sAKJZTHJ012734;
 Thu, 20 Nov 2014 19:35:29 GMT (envelope-from emaste@FreeBSD.org)
Message-Id: <201411201935.sAKJZTHJ012734@svn.freebsd.org>
X-Authentication-Warning: svn.freebsd.org: emaste set sender to
 emaste@FreeBSD.org using -f
From: Ed Maste <emaste@FreeBSD.org>
Date: Thu, 20 Nov 2014 19:35:29 +0000 (UTC)
To: src-committers@freebsd.org, svn-src-all@freebsd.org,
 svn-src-stable@freebsd.org, svn-src-stable-10@freebsd.org
Subject: svn commit: r274757 - stable/10/usr.bin/grep/regex
X-SVN-Group: stable-10
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
X-BeenThere: svn-src-all@freebsd.org
X-Mailman-Version: 2.1.18-1
Precedence: list
List-Id: "SVN commit messages for the entire src tree \(except for &quot;
 user&quot; and &quot; projects&quot; \)" <svn-src-all.freebsd.org>
List-Unsubscribe: <http://lists.freebsd.org/mailman/options/svn-src-all>,
 <mailto:svn-src-all-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/svn-src-all/>
List-Post: <mailto:svn-src-all@freebsd.org>
List-Help: <mailto:svn-src-all-request@freebsd.org?subject=help>
List-Subscribe: <http://lists.freebsd.org/mailman/listinfo/svn-src-all>,
 <mailto:svn-src-all-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Thu, 20 Nov 2014 19:35:30 -0000

Author: emaste
Date: Thu Nov 20 19:35:29 2014
New Revision: 274757
URL: https://svnweb.freebsd.org/changeset/base/274757

Log:
  bsdgrep: Work-around for segmentation fault.
  
  Fix by David Carlier.
  
  MFC of r272127
  Obtained from:	HardenedBSD
  PR:		167921

Modified:
  stable/10/usr.bin/grep/regex/tre-fastmatch.c
Directory Properties:
  stable/10/   (props changed)

Modified: stable/10/usr.bin/grep/regex/tre-fastmatch.c
==============================================================================
--- stable/10/usr.bin/grep/regex/tre-fastmatch.c	Thu Nov 20 19:28:42 2014	(r274756)
+++ stable/10/usr.bin/grep/regex/tre-fastmatch.c	Thu Nov 20 19:35:29 2014	(r274757)
@@ -727,7 +727,7 @@ badpat:
       for (unsigned int i = 0; i < fg->len; i++)
 	if (fg->pattern[i] == '\\')
 	  escaped = !escaped;
-	else if (fg->pattern[i] == '.' && escaped)
+	else if (fg->pattern[i] == '.' && fg->escmap && escaped)
 	  {
 	    fg->escmap[i] = true;
 	    escaped = false;