Wireshark · Wireshark-commits: [Wireshark-commits] master-3.2 f4db9ac: dicom: Handle frames with segments from different reassembli

[Wireshark code review <code-review-do-not-reply@xxxxxxxxxxxxx>]

URL: https://code.wireshark.org/review/gitweb?p=wireshark.git;a=commit;h=f4db9acd5f4df2bdad43401b1df9f3c259598519
Submitter: "Anders Broman <a.broman58@xxxxxxxxx>"
Changed: branch: master-3.2
Repository: wireshark

Commits:

f4db9ac 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>
    (cherry picked from commit df69e61cb6bc3910975d864175a1f64476fcd25c)
    Reviewed-on: https://code.wireshark.org/review/38207
    Reviewed-by: Jaap Keuter <jaap.keuter@xxxxxxxxx>
    Petri-Dish: Jaap Keuter <jaap.keuter@xxxxxxxxx>
    

Actions performed:

    from  f404b09   PROFINET: DHCP suboption undefined bytes
     add  f4db9ac   dicom: Handle frames with segments from different reassemblies


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