[Midnightbsd-cvs] src [8787] trunk/usr.bin/grep/regex/tre-fastmatch.c: fix a segfault when bsdgrp -i is given an empty pattern

laffer1 at midnightbsd.org laffer1 at midnightbsd.org
Sun Sep 25 23:14:06 EDT 2016


Revision: 8787
          http://svnweb.midnightbsd.org/src/?rev=8787
Author:   laffer1
Date:     2016-09-25 23:14:06 -0400 (Sun, 25 Sep 2016)
Log Message:
-----------
fix a segfault when bsdgrp -i is given an empty pattern

Modified Paths:
--------------
    trunk/usr.bin/grep/regex/tre-fastmatch.c

Modified: trunk/usr.bin/grep/regex/tre-fastmatch.c
===================================================================
--- trunk/usr.bin/grep/regex/tre-fastmatch.c	2016-09-26 03:13:38 UTC (rev 8786)
+++ trunk/usr.bin/grep/regex/tre-fastmatch.c	2016-09-26 03:14:06 UTC (rev 8787)
@@ -468,7 +468,7 @@
   fg->nosub = (cflags & REG_NOSUB);					\
 									\
   /* Cannot handle REG_ICASE with MB string */				\
-  if (fg->icase && (TRE_MB_CUR_MAX > 1))				\
+  if (fg->icase && (TRE_MB_CUR_MAX > 1) && n > 0)			\
     {									\
       DPRINT(("Cannot use fast matcher for MBS with REG_ICASE\n"));	\
       return REG_BADPAT;						\



More information about the Midnightbsd-cvs mailing list