Wireshark-commits: [Wireshark-commits] master-1.12 723f119: pcapng: handle NRB with options
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: Sat, 29 Aug 2015 19:45:06 +0000 (UTC)
URL: https://code.wireshark.org/review/gitweb?p=wireshark.git;a=commit;h=723f119653123a430baf0b2e78e7298393695477
Submitter: Hadriel Kaplan (hadrielk@xxxxxxxxx)
Changed: branch: master-1.12
Repository: wireshark

Commits:

723f119 by Hadriel Kaplan (hadrielk@xxxxxxxxx):

    pcapng: handle NRB with options
    
    If a pcapng Name Resolution Block has options, they should not screw up the
    pcapng reader and cause it to fail to read the file.
    
    Bug: 11485
    Change-Id: Ic27cba937b6d93a3d9ed92522ed6b39ae2daeb8f
    Reviewed-on: https://code.wireshark.org/review/10307
    Petri-Dish: Hadriel Kaplan <hadrielk@xxxxxxxxx>
    Tested-by: Petri Dish Buildbot <buildbot-no-reply@xxxxxxxxxxxxx>
    Reviewed-by: Hadriel Kaplan <hadrielk@xxxxxxxxx>
    (cherry picked from commit 605f33caaf5ccae26cd8f5c7ca5ac4813e0c40b2)
    Reviewed-on: https://code.wireshark.org/review/10309
    

Actions performed:

    from  d00a628   pcapng: do not byte-swap NRB IPv4 address
    adds  723f119   pcapng: handle NRB with options


Summary of changes:
 wiretap/pcapng.c |   16 ++++++++++++++--
 1 file changed, 14 insertions(+), 2 deletions(-)