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

Bug found bei Keith & Seth: input framework was not handling counts and ints out of 32-bit-range correctly.

Browse source 
Note - another bugfix will be coming later (problem reading sets containing zero-length-strings & un-escaping-bug in sets)
This commit is contained in:
Bernhard Amann 2012-08-26 14:49:37 -07:00
parent c1c9c9e34a
commit 124c985d7a
3 changed files with 50 additions and 3 deletions
Download patch file Download diff file Expand all files Collapse all files

6
src/input/readers/Ascii.cc
View file

@ -238,7 +238,7 @@ Value* Ascii::EntryToVal(string s, FieldMapping field)
break; break;
case TYPE_INT: case TYPE_INT:
val->val.int_val = atoi(s.c_str()); val->val.int_val = strtoll(s.c_str(), (char**) NULL, 10);
break; break;
case TYPE_DOUBLE: case TYPE_DOUBLE:
@ -249,7 +249,7 @@ Value* Ascii::EntryToVal(string s, FieldMapping field)
case TYPE_COUNT: case TYPE_COUNT:
case TYPE_COUNTER: case TYPE_COUNTER:
val->val.uint_val = atoi(s.c_str()); val->val.uint_val = strtoull(s.c_str(),(char**) NULL, 10);
break; break;
case TYPE_PORT: case TYPE_PORT:
@ -344,7 +344,7 @@ Value* Ascii::EntryToVal(string s, FieldMapping field)
if ( pos != length ) if ( pos != length )
{ {
Error("Internal error while parsing set: did not find all elements"); Error(Fmt("Internal error while parsing set: did not find all elements: %s", s.c_str()));
return 0; return 0;
} }

3
testing/btest/Baseline/scripts.base.frameworks.input.bignumber/out Normal file
View file

@ -0,0 +1,3 @@
{
[9223372036854775800] = [c=18446744073709551612]
}

44
testing/btest/scripts/base/frameworks/input/bignumber.bro Normal file
View file

@ -0,0 +1,44 @@
# (uses listen.bro just to ensure input sources are more reliably fully-read).
# @TEST-SERIALIZE: comm
#
# @TEST-EXEC: btest-bg-run bro bro -b %INPUT
# @TEST-EXEC: btest-bg-wait -k 5
# @TEST-EXEC: btest-diff out
@TEST-START-FILE input.log
#separator \x09
#fields i c
#types int count
9223372036854775800 18446744073709551612
@TEST-END-FILE
@load frameworks/communication/listen
global outfile: file;
module A;
type Idx: record {
i: int;
};
type Val: record {
c: count;
};
global servers: table[int] of Val = table();
event bro_init()
{
outfile = open("../out");
# first read in the old stuff into the table...
Input::add_table([$source="../input.log", $name="ssh", $idx=Idx, $val=Val, $destination=servers]);
Input::remove("ssh");
}
event Input::update_finished(name: string, source:string)
{
print outfile, servers;
close(outfile);
terminate();
}