]> git.ipfire.org Git - thirdparty/snort3.git/commitdiff
Pull request #5104: stream: skip check for held packet retransmit if current packet...
authorDavis McPherson -X (davmcphe - XORIANT CORPORATION at Cisco) <davmcphe@cisco.com>
Mon, 26 Jan 2026 19:51:50 +0000 (19:51 +0000)
committerSteven Baigal (sbaigal) <sbaigal@cisco.com>
Mon, 26 Jan 2026 19:51:50 +0000 (19:51 +0000)
Merge in SNORT/snort3 from ~DAVMCPHE/snort3:snort_crash_held_packet to master

Squashed commit of the following:

commit 675460c81bb068e75c5f7147f75b3548e67baecf
Author: davis mcpherson <davmcphe@cisco.com>
Date:   Wed Jan 14 11:17:17 2026 -0500

    stream: skip check for held packet retransmit if current packet is not a wire packet

src/stream/tcp/tcp_stream_tracker.cc

index 81c17eb0da054bd5145fdc12ef1dc7120c3f9a26..6c8329007255dfd73c01b02d27fceb3e6e9a1f6e 100644 (file)
@@ -935,7 +935,7 @@ uint32_t TcpStreamTracker::perform_partial_flush()
 
 bool TcpStreamTracker::is_retransmit_of_held_packet(Packet* cp)
 {
-    if ( !is_holding_packet() )
+    if ( !is_holding_packet() or !cp->ptrs.tcph )
         return false;
 
     if ( cp->daq_msg == held_packet->get_daq_msg() )