osmith
/
wireshark
forked from osmocom/wireshark
1
0
Fork 0
Code Pull Requests Releases Wiki Activity

tcp: Fix a comparison that should be strict in OOO processing 

We don't want to add a zero length segment to the reassembly here.
Related to #17406
This commit is contained in:
John Thacker 2022-08-26 00:17:40 -04:00 committed by A Wireshark GitLab Utility
parent 89457e01da
commit e725502afa
1 changed files with 1 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
epan/dissectors/packet-tcp.c
View File

@ -3674,7 +3674,7 @@ split_msp(packet_info *pinfo, struct tcp_multisegment_pdu *msp, struct tcp_analy
guint32 frag_offset = fd_i->offset;
guint32 frag_len = fd_i->len;
/* Check for some unusual out of order overlapping segment situations. */
if (split_offset <= frag_offset + frag_len) {
if (split_offset < frag_offset + frag_len) {
if (fd_i->offset < split_offset) {
frag_offset = split_offset;
frag_len -= (split_offset - fd_i->offset);