diff options
| author | Uli Heilmeier <uh@heilmeier.eu> | 2016-11-13 20:16:49 +0100 |
|---|---|---|
| committer | Alexis La Goutte <alexis.lagoutte@gmail.com> | 2016-11-14 09:02:06 +0000 |
| commit | fde5e29fc14d593ef90ae32adf2c9016c7a550c2 (patch) | |
| tree | 6c706064ce514633ca3c1f7d6ed550a3af2ccb9b | |
| parent | a7d9c74be0b8b0115f01729a94455350e7e92e8f (diff) | |
| download | wireshark-fde5e29fc14d593ef90ae32adf2c9016c7a550c2.tar.gz | |
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>
| -rw-r--r-- | epan/dissectors/packet-dcm.c | 2 |
1 files changed, 1 insertions, 1 deletions
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 */ |