Bug fixes.

- Fixing a crash with an invalid pointer.

- Fixing a namespacing problem with is_ftp_data_conn() and check_relay_3().

- Fixing the do-we-have-an-event-handler-defined check.

Standard test-suite passes.

Seth, I think you can give it a try now ...
This commit is contained in:
Robin Sommer 2011-03-10 17:53:09 -08:00
parent 871561939b
commit 45ebfbb2b8
8 changed files with 29 additions and 17 deletions

View file

@ -1463,9 +1463,9 @@ int same_type(const BroType* t1, const BroType* t2, int is_init)
int same_attrs(const Attributes* a1, const Attributes* a2)
{
if ( ! a1 )
return (a2 != 0);
return (a2 == 0);
if ( ! a2 )
if ( a2 )
return 0;
return (*a1 == *a2);