Fix a bug in bsdgrep that caused the program to hang in a tight loop for
some combinations of command line options and search patterns. The code was examining regexec flags looking for a regcomp flag value. The fix is to look in the struct field where the decoded regcomp flag was stored when the regex was compiled. With this fix, it's possible to build WITHOUT_GNU_GREP_COMPAT and WITH_BSDGREP and have a usable GPL-free grep (which of course lacks gnugrep extensions). It now passes the kyua tests except for one test that requires the -z/--null-data gnu extension, and one test involving outputting context lines across multiple files which appears to sometimes output an extra delimiter line ("--") between matches (a rather obscure failure of a rather obscure feature, so bsdgrep should be generally usable now).
This commit is contained in:
parent
49d8ebfe0e
commit
79b05c7ff0
Notes:
svn2git
2020-12-20 02:59:44 +00:00
svn path=/head/; revision=296799
@ -50,7 +50,7 @@ typedef enum { STR_WIDE, STR_BYTE, STR_MBS, STR_USER } tre_str_type_t;
|
||||
if ((long long)pmatch[0].rm_eo - pmatch[0].rm_so < 0) \
|
||||
return REG_NOMATCH; \
|
||||
ret = fn; \
|
||||
for (unsigned i = 0; (!(eflags & REG_NOSUB) && (i < nmatch)); i++)\
|
||||
for (unsigned i = 0; (!preg->nosub && (i < nmatch)); i++) \
|
||||
{ \
|
||||
pmatch[i].rm_so += offset; \
|
||||
pmatch[i].rm_eo += offset; \
|
||||
|
Loading…
Reference in New Issue
Block a user