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

DICOM: Reassemble only when "More Fragments" is set. 

When a TCP frame contains more DICOM segments, make sure that
only segments with "More fragments" bit set gets reassembled.

Bug: 13110
Change-Id: Ie19c71285a00240a035ff92ce3183de4d9048cbd
Reviewed-on: https://code.wireshark.org/review/18805
Reviewed-by: Michael Mann <mmann78@netscape.net>
Petri-Dish: Michael Mann <mmann78@netscape.net>
Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org>
Reviewed-by: Alexis La Goutte <alexis.lagoutte@gmail.com>
This commit is contained in:
Uli Heilmeier 2016-11-13 20:16:49 +01:00 committed by Alexis La Goutte
parent a7d9c74be0
commit fde5e29fc1
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-dcm.c
View File

@ -6686,7 +6686,7 @@ dissect_dcm_pdv_fragmented(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree,
pdv_body_len,
!(pdv->is_last_fragment));
if (head && (head->next == NULL)) {
if ((head && (head->next == NULL)) || pdv->is_last_fragment) {
/* Was not really fragmented, therefore use 'conventional' decoding
fragment_add_seq_next() won't add any items to the list, when last fragment only
*/