Wireshark-commits: [Wireshark-commits] master 18bbdb4: Distinguish between "probably not pcapng" an
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: Wed, 07 Feb 2018 22:51:58 +0000
URL: https://code.wireshark.org/review/gitweb?p=wireshark.git;a=commit;h=18bbdb478e8b3ffa353810d6df19b2b217a2c24d
Submitter: Guy Harris (guy@xxxxxxxxxxxx)
Changed: branch: master
Repository: wireshark

Commits:

18bbdb4 by Guy Harris (guy@xxxxxxxxxxxx):

    Distinguish between "probably not pcapng" and "probably bad pcapng" errors.
    
    Go back to having pcapng_read_block() and
    pcapng_read_section_header_block() treating SHB read errors that might
    be due to the file not being a pcapng file separately from other errors.
    
    This keeps us from treating pcapng files with malformed SHBs as not
    being pcapng files, making us dissect them using the pcapng file
    dissector rather than reporting the malformation.
    
    Change-Id: I1d92cc4ac521668b88638b2b3ed5257340451798
    Ping-Bug: 14402
    Reviewed-on: https://code.wireshark.org/review/25675
    Reviewed-by: Guy Harris <guy@xxxxxxxxxxxx>
    

Actions performed:

    from  600b84f   Clean up the null pointer check in profile_exists().
    adds  18bbdb4   Distinguish between "probably not pcapng" and "probably bad pcapng" errors.


Summary of changes:
 wiretap/pcapng.c | 140 +++++++++++++++++++++++++++++++++----------------------
 1 file changed, 85 insertions(+), 55 deletions(-)