Wireshark-commits: [Wireshark-commits] master-2.0 fa22308: Don't assume packets will be no larger t

Date Prev · Date Next · Thread Prev · Thread Next
Date Index · Thread Index · Other Months · All Mailing Lists
From: Wireshark code review <code-review-do-not-reply@xxxxxxxxxxxxx>
Date: Mon, 2 May 2016 00:54:07 +0000 (UTC)
URL: https://code.wireshark.org/review/gitweb?p=wireshark.git;a=commit;h=fa2230886c18513a34653d7509e3e690b15aab96
Submitter: Guy Harris (guy@xxxxxxxxxxxx)
Changed: branch: master-2.0
Repository: wireshark

Commits:

fa22308 by Guy Harris (guy@xxxxxxxxxxxx):

    Don't assume packets will be no larger than ISERIES_MAX_PACKET_LEN.
    
    We don't check against it.  Insteead, use phdr->caplen as the buffer
    size; that's based on the number of hex digits we've found.
    
    While we're at it, also get rid of ISERIES_PKT_ALLOC_SIZE - it makes it
    less obvious that it's based on the packet length from the packet
    header.
    
    Change-Id: I8ad6306c62e7bc4cf896b335f39a5a77780fb2ea
    Reviewed-on: https://code.wireshark.org/review/15236
    Reviewed-by: Guy Harris <guy@xxxxxxxxxxxx>
    (cherry picked from commit 6332c2f45e5f0b23893a41def45384911f28109a)
    Reviewed-on: https://code.wireshark.org/review/15237
    

Actions performed:

    from  0a2a956   Make sure the packet length isn't > WTAP_MAX_PACKET_SIZE.
    adds  fa22308   Don't assume packets will be no larger than ISERIES_MAX_PACKET_LEN.


Summary of changes:
 wiretap/iseries.c |   14 ++++++--------
 1 file changed, 6 insertions(+), 8 deletions(-)