diff --git a/CHANGES b/CHANGES index c1cda34c2b..50a8fa0b0c 100644 --- a/CHANGES +++ b/CHANGES @@ -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 * Bump BTest to 0.64. diff --git a/VERSION b/VERSION index 297e23f420..44d9b6fed6 100644 --- a/VERSION +++ b/VERSION @@ -1 +1 @@ -3.3.0-dev.465 +3.3.0-dev.467 diff --git a/src/Sessions.cc b/src/Sessions.cc index 0e9393e4dc..f8b0055b21 100644 --- a/src/Sessions.cc +++ b/src/Sessions.cc @@ -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) { + const char* weird_name = name; + if ( pkt ) + { pkt->dump_packet = true; - const char* weird_name; - if ( pkt->encap && pkt->encap->LastType() != BifEnum::Tunnel::NONE ) - weird_name = util::fmt("%s_in_tunnel", name); - else - weird_name = name; + if ( pkt->encap && pkt->encap->LastType() != BifEnum::Tunnel::NONE ) + weird_name = util::fmt("%s_in_tunnel", name); - if ( pkt->ip_hdr ) - reporter->Weird(pkt->ip_hdr->SrcAddr(), pkt->ip_hdr->DstAddr(), weird_name, addl); - else - reporter->Weird(weird_name, addl); + if ( pkt->ip_hdr ) + { + reporter->Weird(pkt->ip_hdr->SrcAddr(), pkt->ip_hdr->DstAddr(), weird_name, addl); + return; + } + } + + reporter->Weird(weird_name, addl); } void NetSessions::Weird(const char* name, const IP_Hdr* ip, const char* addl) diff --git a/src/packet_analysis/protocol/ip/IP.cc b/src/packet_analysis/protocol/ip/IP.cc index 4a0048f641..aff4f5606d 100644 --- a/src/packet_analysis/protocol/ip/IP.cc +++ b/src/packet_analysis/protocol/ip/IP.cc @@ -26,6 +26,7 @@ IPAnalyzer::IPAnalyzer() IPAnalyzer::~IPAnalyzer() { + delete discarder; } bool IPAnalyzer::AnalyzePacket(size_t len, const uint8_t* data, Packet* packet)