Wireshark-commits: [Wireshark-commits] master df69e61: dicom: Handle frames with segments from diff
Date Index · Thread Index · Other Months · All Mailing Lists
Date Prev · Date Next · Thread Prev · Thread Next
From: Wireshark code review <code-review-do-not-reply@xxxxxxxxxxxxx>
Date: Thu, 20 Aug 2020 13:28:53 +0000
URL: https://code.wireshark.org/review/gitweb?p=wireshark.git;a=commit;h=df69e61cb6bc3910975d864175a1f64476fcd25c
Submitter: "Anders Broman <a.broman58@xxxxxxxxx>"
Changed: branch: master
Repository: wireshark

Commits:

df69e61 by John Thacker (johnthacker@xxxxxxxxx):

    dicom: Handle frames with segments from different reassemblies
    
    There can be multiple PDV segments in the same frame that belong to
    different reassemblies. Change the reassembly_id used for the
    reassembly tables so that it is not identical for all segments in
    the same presentation context (but still unique for a given reassembly),
    so that that case can be handled properly. Otherwise fragment_add_seq_next
    will retrieve the wrong reassembly for one of the segments (especially
    on the second pass.)
    
    Bug: 13110
    Change-Id: Ib967fc7f6b7b591b9e3494d81d3b5d4ecc43cac1
    Reviewed-on: https://code.wireshark.org/review/38200
    Petri-Dish: Anders Broman <a.broman58@xxxxxxxxx>
    Tested-by: Petri Dish Buildbot
    Reviewed-by: Anders Broman <a.broman58@xxxxxxxxx>
    

Actions performed:

    from  abd6f14   S1AP: upgrade dissector to v16.2.0
     add  df69e61   dicom: Handle frames with segments from different reassemblies


Summary of changes:
 epan/dissectors/packet-dcm.c | 16 +++++++++++++++-
 1 file changed, 15 insertions(+), 1 deletion(-)