summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authoremaste <emaste@FreeBSD.org>2014-11-20 19:35:29 +0000
committeremaste <emaste@FreeBSD.org>2014-11-20 19:35:29 +0000
commit3df6bbce99149227fe1640ed9039ff88660d346a (patch)
tree77185abf6185d41f9fb2d2a667dcfd0bea048d96
parentb634635a73c9af335c794449b95fa6c02663e42a (diff)
downloadFreeBSD-src-3df6bbce99149227fe1640ed9039ff88660d346a.zip
FreeBSD-src-3df6bbce99149227fe1640ed9039ff88660d346a.tar.gz
bsdgrep: Work-around for segmentation fault.
Fix by David Carlier. MFC of r272127 Obtained from: HardenedBSD PR: 167921
-rw-r--r--usr.bin/grep/regex/tre-fastmatch.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/usr.bin/grep/regex/tre-fastmatch.c b/usr.bin/grep/regex/tre-fastmatch.c
index eddab26..0881c55 100644
--- a/usr.bin/grep/regex/tre-fastmatch.c
+++ b/usr.bin/grep/regex/tre-fastmatch.c
@@ -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;
OpenPOWER on IntegriCloud