ok, this one is a bit... embarrassing.

Delete the correct entry in case of error. Fixes a segfault when the faulty
data is of type string and not the last field of the input...
This commit is contained in:
Bernhard Amann 2012-12-05 12:40:00 -08:00
parent 32239ea633
commit d367e227c1
4 changed files with 54 additions and 1 deletions

View file

@ -572,7 +572,7 @@ bool Ascii::DoUpdate()
// array structure.
for ( int i = 0; i < fpos; i++ )
delete fields[fpos];
delete fields[i];
delete [] fields;
continue;

View file

@ -0,0 +1,4 @@
error: ../input.log/Input::READER_ASCII: String 'l' contained no parseable number
error: ../input.log/Input::READER_ASCII: Could not convert line ' l' to Val. Ignoring line.
received termination signal
>>>

View file

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

View file

@ -0,0 +1,46 @@
# (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-EXEC: sed 1d .stderr > .stderrwithoutfirstline
# @TEST-EXEC: TEST_DIFF_CANONIFIER=$SCRIPTS/diff-remove-abspath btest-diff .stderrwithoutfirstline
@TEST-START-FILE input.log
#separator \x09
#fields i c
#types int count
l
5
@TEST-END-FILE
@load frameworks/communication/listen
global outfile: file;
module A;
type Idx: record {
i: string;
};
type Val: record {
c: count;
};
global servers: table[string] 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::end_of_data(name: string, source:string)
{
print outfile, servers;
terminate();
}