From fde5e29fc14d593ef90ae32adf2c9016c7a550c2 Mon Sep 17 00:00:00 2001 From: Uli Heilmeier Date: Sun, 13 Nov 2016 20:16:49 +0100 Subject: [PATCH] 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 Petri-Dish: Michael Mann Tested-by: Petri Dish Buildbot Reviewed-by: Alexis La Goutte --- epan/dissectors/packet-dcm.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/epan/dissectors/packet-dcm.c b/epan/dissectors/packet-dcm.c index d38ebe11e1..fa7bd2cf59 100644 --- a/epan/dissectors/packet-dcm.c +++ b/epan/dissectors/packet-dcm.c @@ -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 */