Wireshark · Wireshark-commits: [Wireshark-commits] master-3.0 4c6f6ad: iso14443: use the correct I-block payload

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

URL: https://code.wireshark.org/review/gitweb?p=wireshark.git;a=commit;h=4c6f6ad466b14193cb358859fa1bd6cc030c5b5b
Submitter: "Martin Kaiser <wireshark@xxxxxxxxx>"
Changed: branch: master-3.0
Repository: wireshark

Commits:

4c6f6ad by Martin Kaiser (wireshark@xxxxxxxxx):

    iso14443: use the correct I-block payload
    
    When we reassemble I-blocks, we pass the payload to fragment_add_seq_next.
    To do so, we use the overall iso14443 tvb, an offset and the payload length
    as parameters.
    
    We then call process_reassembled_data to do reassembly. If the I-block was
    not fragmented, process_reassembled_data returns the only fragment + the
    rest of the packet after this fragment.
    
    This might be a misunderstanding on my part or something to be fixed in the
    reassembly routines. For now, we work around this by defining a new tvb for
    the data we submit to fragment_add_seq_next.
    
    (I ran into a similar issue years ago for DVB-CI. Add a comment about this.
    If it turns out that there's a better way to fix this, we should be fixing
    both dissectors.)
    
    Change-Id: Id83ab152529a5150669df3099df6f60be7a3a723
    Reviewed-on: https://code.wireshark.org/review/33355
    Petri-Dish: Martin Kaiser <wireshark@xxxxxxxxx>
    Tested-by: Petri Dish Buildbot
    Petri-Dish: Anders Broman <a.broman58@xxxxxxxxx>
    Reviewed-by: Martin Kaiser <wireshark@xxxxxxxxx>
    (cherry picked from commit d44cb24f1f6668db70baef59f81e7778f4230bf9)
    Reviewed-on: https://code.wireshark.org/review/33425
    

Actions performed:

    from  771b937   Fix handling of headers in body part.
     add  4c6f6ad   iso14443: use the correct I-block payload


Summary of changes:
 epan/dissectors/packet-iso14443.c | 13 ++++++++-----
 1 file changed, 8 insertions(+), 5 deletions(-)