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

fix small bug with vectors and sets.

Browse source 
On a first glance - this kind of seems to work. On mac-os you need
a newer than the system-installed sqlite - the hanging problem only
occurs with that one...
This commit is contained in:
Bernhard Amann 2013-03-11 13:10:56 -07:00
parent 5d12765886
commit a251a1c39a
3 changed files with 13 additions and 7 deletions
Download patch file Download diff file Expand all files Collapse all files

11
src/logging/writers/SQLite.cc
View file

@ -109,14 +109,17 @@ bool SQLite::checkError( int code )
return false;
}
bool SQLite::DoInit(const WriterInfo& info, int num_fields,
const Field* const * fields)
bool SQLite::DoInit(const WriterInfo& info, int arg_num_fields,
const Field* const * arg_fields)
{
if ( sqlite3_threadsafe() == 0 )
{
Error("SQLite reports that it is not threadsafe. Bro needs a threadsafe version of SQLite. Aborting");
return false;
}
num_fields = arg_num_fields;
fields = arg_fields;
string fullpath(info.path);
fullpath.append(".sqlite");
@ -300,7 +303,7 @@ int SQLite::AddParams(Value* val, int pos)
if ( j > 0 )
desc.AddRaw(set_separator);
io->Describe(&desc, val->val.set_val.vals[j], NULL);
io->Describe(&desc, val->val.set_val.vals[j], fields[pos]->name);
// yes, giving NULL here is not really really pretty....
// it works however, because tables cannot contain tables...
// or vectors.
@ -320,7 +323,7 @@ int SQLite::AddParams(Value* val, int pos)
if ( j > 0 )
desc.AddRaw(set_separator);
io->Describe(&desc, val->val.vector_val.vals[j], NULL);
io->Describe(&desc, val->val.vector_val.vals[j], fields[pos]->name);
}
desc.RemoveEscapeSequence(set_separator);