Skip site navigation (1)Skip section navigation (2)
Date:      Sun, 12 Jul 2015 15:24:06 +0000 (UTC)
From:      "Pedro F. Giffuni" <pfg@FreeBSD.org>
To:        src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-stable@freebsd.org, svn-src-stable-9@freebsd.org
Subject:   svn commit: r285419 - stable/9/usr.bin/grep/regex
Message-ID:  <201507121524.t6CFO6OS053545@repo.freebsd.org>

next in thread | raw e-mail | index | archive | help
Author: pfg
Date: Sun Jul 12 15:24:05 2015
New Revision: 285419
URL: https://svnweb.freebsd.org/changeset/base/285419

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

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

Modified: stable/9/usr.bin/grep/regex/tre-fastmatch.c
==============================================================================
--- stable/9/usr.bin/grep/regex/tre-fastmatch.c	Sun Jul 12 09:42:10 2015	(r285418)
+++ stable/9/usr.bin/grep/regex/tre-fastmatch.c	Sun Jul 12 15:24:05 2015	(r285419)
@@ -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;



Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?201507121524.t6CFO6OS053545>