diff options
Diffstat (limited to 'src/dfasearch.c')
| -rw-r--r-- | src/dfasearch.c | 32 |
1 files changed, 19 insertions, 13 deletions
diff --git a/src/dfasearch.c b/src/dfasearch.c index 42026660..9fb74496 100644 --- a/src/dfasearch.c +++ b/src/dfasearch.c @@ -284,26 +284,32 @@ EGexecute (char const *buf, size_t size, size_t *match_size, /* Try matching with the superset of DFA, if it's defined. */ if (superset && !exact_kwset_match) { - next_beg = dfaexec (superset, dfa_beg, (char *) end, 1, - &count, NULL); - /* If there's no match, or if we've matched the sentinel, - we're done. */ - if (next_beg == NULL || next_beg == end) - continue; - - /* Narrow down to the line we've found. */ - if (count != 0) + while (true) { + next_beg = dfaexec (superset, dfa_beg, (char *) end, 1, + &count, NULL); + /* If there's no match, or if we've matched the sentinel, + we're done. */ + if (next_beg == NULL || next_beg == end) + break; + + if (count == 0) + break; + count = 0; + /* If dfaexec may match in multiple lines, try to match in one line. */ - end = memrchr (buf, eol, next_beg - buf); - end++; - continue; + beg = memrchr (buf, eol, next_beg - buf); + beg = beg ? beg + 1 : buf; + dfa_beg = beg; } + if (next_beg == NULL || next_beg == end) + continue; + + /* Narrow down to the line we've found. */ end = memchr (next_beg, eol, buflim - next_beg); end = end ? end + 1 : buflim; } - /* Try matching with DFA. */ next_beg = dfaexec (dfa, dfa_beg, (char *) end, 0, &count, &backref); |