Merge remote branch 'origin/fastpath'

* origin/fastpath:
  Adding 'delete' fixes into fastpath.
This commit is contained in:
Robin Sommer 2011-07-07 15:56:01 -07:00
commit 1ebcf4f422
2 changed files with 6 additions and 0 deletions

View file

@ -951,6 +951,8 @@ bool LogMgr::Write(EnumVal* id, RecordVal* columns)
DBG_LOG(DBG_LOGGING, "Wrote record to filter '%s' on stream '%s'",
filter->name.c_str(), stream->name.c_str());
#endif
delete [] vals;
}
Unref(columns);
@ -1041,6 +1043,7 @@ LogVal* LogMgr::ValToLogVal(Val* val, BroType* ty)
for ( int i = 0; i < lval->val.set_val.size; i++ )
lval->val.set_val.vals[i] = ValToLogVal(set->Index(i));
Unref(set);
break;
}

View file

@ -16,6 +16,9 @@ LogWriter::~LogWriter()
if ( buf )
free(buf);
for(int i = 0; i < num_fields; ++i)
delete fields[i];
delete [] fields;
}