Wireshark-commits: [Wireshark-commits] master 6d6094e: Don't fail if a pcap-NG PB or EPB has caplen
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: Fri, 25 Apr 2014 17:44:48 +0000 (UTC)
URL: https://code.wireshark.org/review/gitweb?p=wireshark.git;a=commit;h=6d6094e3498254de69f4878502a97b7fa3028207
Submitter: Guy Harris (guy@xxxxxxxxxxxx)
Changed: branch: master
Repository: wireshark

Commits:

6d6094e by Guy Harris (guy@xxxxxxxxxxxx):

    Don't fail if a pcap-NG PB or EPB has caplen > actual len.
    
    We don't fail for other file types; there's no point in failing for
    pcap-NG.  wtap_read() will ensure that caplen <= len.
    
    Make wtap_seek_read() ensure that caplen <= len as well.
    
    Fixes bug 10037.
    
    Change-Id: I41fbcf54341ea0429cef875442ea1f1377177a5f
    Reviewed-on: https://code.wireshark.org/review/1353
    Reviewed-by: Guy Harris <guy@xxxxxxxxxxxx>
    

Actions performed:

    from  83fe357   Fix reading keyfile for "any" IP address
    adds  6d6094e   Don't fail if a pcap-NG PB or EPB has caplen > actual len.


Summary of changes:
 wiretap/pcapng.c |    6 ------
 wiretap/wtap.c   |   20 +++++++++++++++++++-
 2 files changed, 19 insertions(+), 7 deletions(-)