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

fix bug in input-manager regarding enums that a writer reads without

Browse source 
0-terminating the string
This commit is contained in:
Bernhard Amann 2013-05-13 20:26:41 -07:00
parent 6c99df508c
commit 8f7619971f
4 changed files with 15 additions and 8 deletions
Download patch file Download diff file Expand all files Collapse all files

12
src/input/Manager.cc
View file

@ -2119,12 +2119,16 @@ Val* Manager::ValueToVal(const Value* val, BroType* request_type)
case TYPE_ENUM: { case TYPE_ENUM: {
// well, this is kind of stupid, because EnumType just mangles the module name and the var name together again... // well, this is kind of stupid, because EnumType just mangles the module name and the var name together again...
// but well // but well
string module = extract_module_name(val->val.string_val.data); // convert to string first to not have to deal with missing \0's...
string var = extract_var_name(val->val.string_val.data); string module_string(val->val.string_val.data, val->val.string_val.length);
string var_string(val->val.string_val.data, val->val.string_val.length);
string module = extract_module_name(module_string.c_str());
string var = extract_var_name(var_string.c_str());
bro_int_t index = request_type->AsEnumType()->Lookup(module, var.c_str()); bro_int_t index = request_type->AsEnumType()->Lookup(module, var.c_str());
if ( index == -1 ) if ( index == -1 )
reporter->InternalError("Value not found in enum mappimg. Module: %s, var: %s", reporter->InternalError("Value not found in enum mappimg. Module: %s, var: %s, var size: %d",
module.c_str(), var.c_str()); module.c_str(), var.c_str(), var.size());
return new EnumVal(index, request_type->Ref()->AsEnumType() ); return new EnumVal(index, request_type->Ref()->AsEnumType() );
} }

4
src/input/readers/SQLite.cc
View file

@ -140,7 +140,7 @@ Value* SQLite::EntryToVal(sqlite3_stmt *st, const threading::Field *field, int p
char *out = new char[length]; char *out = new char[length];
memcpy(out, text, length); memcpy(out, text, length);
val->val.string_val.length = length; val->val.string_val.length = length;
val->val.string_val.data = out; val->val.string_val.data = out;
break; break;
@ -250,7 +250,7 @@ bool SQLite::DoUpdate()
for ( unsigned int i = 0; i < numcolumns; ++i ) for ( int i = 0; i < numcolumns; ++i )
{ {
const char *name = sqlite3_column_name(st, i); const char *name = sqlite3_column_name(st, i);

3
testing/btest/scripts/base/frameworks/input/sqlite/basic.bro
View file

@ -1,5 +1,5 @@
# @TEST-EXEC: cat conn.sql | sqlite3 conn.sqlite # @TEST-EXEC: cat conn.sql | sqlite3 conn.sqlite
# @TEST-EXEC: btest-bg-run bro bro -b --pseudo-realtime -r $TRACES/socks.trace %INPUT # @TEST-EXEC: btest-bg-run bro bro -b %INPUT
# @TEST-EXEC: btest-bg-wait -k 5 # @TEST-EXEC: btest-bg-wait -k 5
# @TEST-EXEC: btest-diff out # @TEST-EXEC: btest-diff out
@ -67,6 +67,7 @@ COMMIT;
@load base/protocols/conn @load base/protocols/conn
redef exit_only_after_terminate = T;
redef Input::accept_unsupported_types = T; redef Input::accept_unsupported_types = T;
global outfile: file; global outfile: file;

4
testing/btest/scripts/base/frameworks/input/sqlite/port.bro
View file

@ -1,5 +1,5 @@
# @TEST-EXEC: cat port.sql | sqlite3 port.sqlite # @TEST-EXEC: cat port.sql | sqlite3 port.sqlite
# @TEST-EXEC: btest-bg-run bro bro -b --pseudo-realtime -r $TRACES/socks.trace %INPUT # @TEST-EXEC: btest-bg-run bro bro -b %INPUT
# @TEST-EXEC: btest-bg-wait -k 5 # @TEST-EXEC: btest-bg-wait -k 5
# @TEST-EXEC: btest-diff out # @TEST-EXEC: btest-diff out
@ -15,6 +15,8 @@ INSERT INTO "port" VALUES(6162,'tcp');
COMMIT; COMMIT;
@TEST-END-FILE @TEST-END-FILE
redef exit_only_after_terminate = T;
global outfile: file; global outfile: file;
module A; module A;