Wireshark-commits: [Wireshark-commits] master-1.12 84a3493: use the captured length as payload leng
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: Mon, 10 Aug 2015 07:35:05 +0000 (UTC)
URL: https://code.wireshark.org/review/gitweb?p=wireshark.git;a=commit;h=84a3493c074ba0d59927593e58175521fee07069
Submitter: Guy Harris (guy@xxxxxxxxxxxx)
Changed: branch: master-1.12
Repository: wireshark

Commits:

84a3493 by Martin Kaiser (wireshark@xxxxxxxxx):

    use the captured length as payload length for zigbee decryption
    
    this length is used for allocating a buffer and for crypto calculations
    we should use the bytes that were actually captured, not the reported
    length
    
    the capture in https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=11389
    has one packet with a stupidly large reported length and a reasonable
    capture length (and one completely bogus packet) - this fix ensures that
    the decryption does not break for the former packet
    
    also, tvb_reported_length_remaining() does not return values < 0 any
    more, remove the check for this
    
    Bug: 11389
    Change-Id: I42cb4526483160416b51e3cb72442148b5fac4f3
    Reviewed-on: https://code.wireshark.org/review/9950
    Reviewed-by: Anders Broman <a.broman58@xxxxxxxxx>
    (cherry picked from commit 655b0dc623e29da212be3e205314624fe3182562)
    Reviewed-on: https://code.wireshark.org/review/9955
    Reviewed-by: Guy Harris <guy@xxxxxxxxxxxx>
    

Actions performed:

    from  a17afa6   [Automatic update for 2015-08-09]
    adds  84a3493   use the captured length as payload length for zigbee decryption


Summary of changes:
 epan/dissectors/packet-zbee-security.c |    6 ++----
 1 file changed, 2 insertions(+), 4 deletions(-)