aboutsummaryrefslogtreecommitdiffstats
path: root/epan/dissectors/packet-tcp.c
diff options
context:
space:
mode:
authorJohn Thacker <johnthacker@gmail.com>2022-09-11 19:35:08 -0400
committerJohn Thacker <johnthacker@gmail.com>2022-09-11 19:40:26 -0400
commit9954de392b8f65c43775e7ad0804108da56c1bcb (patch)
tree4e469990ab82d99a9d6d1ce7ed5b72dec604959f /epan/dissectors/packet-tcp.c
parent834bf082904aa30d217b7aac394d2835d06bfed7 (diff)
tcp: Don't try to desegment at FIN if we can't desegment the frame
Check pinfo->can_desegment before trying to desegment at FIN. Fix #18335
Diffstat (limited to 'epan/dissectors/packet-tcp.c')
-rw-r--r--epan/dissectors/packet-tcp.c1
1 files changed, 1 insertions, 0 deletions
diff --git a/epan/dissectors/packet-tcp.c b/epan/dissectors/packet-tcp.c
index bee236ac98..9edc47ccae 100644
--- a/epan/dissectors/packet-tcp.c
+++ b/epan/dissectors/packet-tcp.c
@@ -8271,6 +8271,7 @@ dissect_tcp(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree, void* data _U_)
* need to explicitly check for that here.
*/
if(tcph->th_have_seglen && tcpd && (tcph->th_flags & TH_FIN)
+ && pinfo->can_desegment
&& (tcpd->fwd->flags&TCP_FLOW_REASSEMBLE_UNTIL_FIN) ) {
struct tcp_multisegment_pdu *msp;