Mirror/zeek
1
0
Fork 0
mirror of https://github.com/zeek/zeek.git synced 2025-10-10 10:38:20 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions 3

strings.bif/do_split_string: Pass bol and eol to MatchPrefix()

Browse source 
This allows better control of BOL and EOL. MatchPrefix() / LongestMatch()
always start with BOL.

Closes #3455
This commit is contained in:
Arne Welzel 2023-11-15 20:22:10 +01:00
parent a3bd3e4c50
commit 98d9089a8f
3 changed files with 60 additions and 3 deletions
Download patch file Download diff file Expand all files Collapse all files

14
src/strings.bif
View file

@ -280,15 +280,23 @@ static zeek::VectorValPtr do_split_string(zeek::StringVal* str_val,
int num_sep = 0;
int offset = 0;
bool bol = true;
const bool eol = true;
while ( n >= 0 )
{
offset = 0;
// Find next match offset.
int end_of_match = 0;
while ( n > 0 &&
(end_of_match = re->MatchPrefix(s + offset, n)) <= 0 )
while ( n > 0 )
{
// Move on to next byte.
end_of_match = re->MatchPrefix(s + offset, n, bol, eol);
if ( end_of_match > 0 )
break;
// Move on to next byte, use BOL only on the byte such that
// a BOL anchored pattern won't be matched anywhere else.
bol = false;
++offset;
--n;
}