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

Merge remote-tracking branch 'origin/topic/timw/coverity'

Browse source 
* origin/topic/timw/coverity:
  Fix a couple of Coverity findings (1433618, 1433619)
This commit is contained in:
Tim Wojtulewicz 2020-10-21 11:06:18 -07:00
commit e70f578621
4 changed files with 19 additions and 10 deletions
Download patch file Download diff file Expand all files Collapse all files

4
CHANGES
View file

@ -1,4 +1,8 @@
3.3.0-dev.467 | 2020-10-21 11:06:18 -0700
* Fix a couple of Coverity findings (1433618, 1433619) (Tim Wojtulewicz, Corelight)
3.3.0-dev.465 | 2020-10-20 13:34:20 +0000 3.3.0-dev.465 | 2020-10-20 13:34:20 +0000
* Bump BTest to 0.64. * Bump BTest to 0.64.

2
VERSION
View file

@ -1 +1 @@
3.3.0-dev.465 3.3.0-dev.467

22
src/Sessions.cc
View file

@ -693,19 +693,23 @@ bool NetSessions::WantConnection(uint16_t src_port, uint16_t dst_port,
void NetSessions::Weird(const char* name, const Packet* pkt, const char* addl) void NetSessions::Weird(const char* name, const Packet* pkt, const char* addl)
{ {
const char* weird_name = name;
if ( pkt ) if ( pkt )
{
pkt->dump_packet = true; pkt->dump_packet = true;
const char* weird_name; if ( pkt->encap && pkt->encap->LastType() != BifEnum::Tunnel::NONE )
if ( pkt->encap && pkt->encap->LastType() != BifEnum::Tunnel::NONE ) weird_name = util::fmt("%s_in_tunnel", name);
weird_name = util::fmt("%s_in_tunnel", name);
else
weird_name = name;
if ( pkt->ip_hdr ) if ( pkt->ip_hdr )
reporter->Weird(pkt->ip_hdr->SrcAddr(), pkt->ip_hdr->DstAddr(), weird_name, addl); {
else reporter->Weird(pkt->ip_hdr->SrcAddr(), pkt->ip_hdr->DstAddr(), weird_name, addl);
reporter->Weird(weird_name, addl); return;
}
}
reporter->Weird(weird_name, addl);
} }
void NetSessions::Weird(const char* name, const IP_Hdr* ip, const char* addl) void NetSessions::Weird(const char* name, const IP_Hdr* ip, const char* addl)

1
src/packet_analysis/protocol/ip/IP.cc
View file

@ -26,6 +26,7 @@ IPAnalyzer::IPAnalyzer()
IPAnalyzer::~IPAnalyzer() IPAnalyzer::~IPAnalyzer()
{ {
delete discarder;
} }
bool IPAnalyzer::AnalyzePacket(size_t len, const uint8_t* data, Packet* packet) bool IPAnalyzer::AnalyzePacket(size_t len, const uint8_t* data, Packet* packet)