osmocom
/
wireshark
11
0
Fork 1
Code Issues Pull Requests Projects Releases Wiki Activity

Fixup fragment 

Fix a fragment idiom changed in 4f3b028d94

Fix #18634
This commit is contained in:
John Thacker 2022-11-14 07:16:52 -05:00
parent b7ed46288a
commit ab27562dbc
3 changed files with 3 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -2354,7 +2354,7 @@ dissect_obex(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree, void *data)
/* packet stream is guaranted to be sequence of fragments, one by one,
so find last fragment for its offset and length */
for (frag = frag_msg->next; frag; frag = frag->next) {}
for (frag = frag_msg->next; frag->next; frag = frag->next) {}
frag_msg = fragment_add_check(&obex_reassembly_table,
tvb, 0, pinfo, pinfo->p2p_dir, NULL,

2
epan/dissectors/packet-smb-pipe.c
View File

@ -3326,7 +3326,7 @@ dissect_pipe_dcerpc(tvbuff_t *d_tvb, packet_info *pinfo, proto_tree *parent_tree
we might pick up from the Read/Write calls instead of
assuming we always get them in the correct order
*/
for (fd_i = fd_head->next; fd_i; fd_i = fd_i->next) {}
for (fd_i = fd_head->next; fd_i->next; fd_i = fd_i->next) {}
fd_head=fragment_add_check(&dcerpc_reassembly_table,
d_tvb, 0, pinfo, fid, NULL,
fd_i->offset+fd_i->len,

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

@ -6387,7 +6387,7 @@ dissect_file_data_smb2_pipe(tvbuff_t *raw_tvb, packet_info *pinfo, proto_tree *t
we might pick up from the Read/Write calls instead of
assuming we always get them in the correct order
*/
for (fd_i = fd_head->next; fd_i; fd_i = fd_i->next) {}
for (fd_i = fd_head->next; fd_i->next; fd_i = fd_i->next) {}
fd_head = fragment_add_check(&smb2_pipe_reassembly_table,
tvb, 0, pinfo, id, NULL,
fd_i->offset+fd_i->len,