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

Fixed another do_split bug and included a test for the fix.

Browse source
This commit is contained in:
Seth Hall 2011-04-22 08:00:28 -04:00
parent dbecbccdbc
commit c5a19f7cdc
3 changed files with 16 additions and 1 deletions
Download patch file Download diff file Expand all files Collapse all files

5
src/strings.bif
View file

@ -244,8 +244,11 @@ Val* do_split(StringVal* str_val, RE_Matcher* re, TableVal* other_sep,
--n; --n;
} }
if ( num_sep >= max_num_sep ) if ( max_num_sep && num_sep >= max_num_sep )
{
offset = end_of_s - s; offset = end_of_s - s;
n=0;
}
Val* ind = new Val(++num, TYPE_COUNT); Val* ind = new Val(++num, TYPE_COUNT);
a->Assign(ind, new StringVal(offset, (const char*) s)); a->Assign(ind, new StringVal(offset, (const char*) s));

9
testing/btest/Baseline/bifs.string_splitting/out
View file

@ -2,3 +2,12 @@
[1] = X-Mailer, [1] = X-Mailer,
[2] = Testing Test (http://www.example.com) [2] = Testing Test (http://www.example.com)
} }
{
[1] = A ,
[6] = =,
[4] = =,
[7] = D,
[5] = C ,
[2] = =,
[3] = B
}

3
testing/btest/bifs/string_splitting.bro
View file

@ -6,4 +6,7 @@ event bro_init()
{ {
local a = "X-Mailer: Testing Test (http://www.example.com)"; local a = "X-Mailer: Testing Test (http://www.example.com)";
print split1(a, /:[[:blank:]]*/); print split1(a, /:[[:blank:]]*/);
a = "A = B = C = D";
print split_all(a, /=/);
} }