Wireshark · Wireshark-commits: [Wireshark-commits] master-2.0 83dd13c: [iseries] fix iseries_check_file_type()

[Wireshark code review <code-review-do-not-reply@xxxxxxxxxxxxx>]

URL: https://code.wireshark.org/review/gitweb?p=wireshark.git;a=commit;h=83dd13cc56cd825219fa3209ae401b730414b413
Submitter: Anders Broman (a.broman58@xxxxxxxxx)
Changed: branch: master-2.0
Repository: wireshark

Commits:

83dd13c by Martin Kaiser (wireshark@xxxxxxxxx):

    [iseries] fix iseries_check_file_type()
    
    check that we have a line that contains OBJECT PROTOCOL ETHERNET
    (at the moment, we fail if there's a line containing OBJECT PROTOCOL but
     not ETHERNET and succeed otherwise
     -> a file with some random lines will be identified as iseries)
    
    initialize our line buffer with 0s to make sure we don't access uninitialized
    data while parsing
    
    don't set wth->priv unless the file is really an iseries file
    
    free the iseries struct if the file is not our type
    
    Bug: 11985
    Change-Id: I0ac7003c047f54ca025d02e59b56d1ff4e2a6be7
    Reviewed-on: https://code.wireshark.org/review/13360
    Petri-Dish: Martin Kaiser <wireshark@xxxxxxxxx>
    Tested-by: Petri Dish Buildbot <buildbot-no-reply@xxxxxxxxxxxxx>
    Reviewed-by: Alexis La Goutte <alexis.lagoutte@xxxxxxxxx>
    (cherry picked from commit 96d585a5e9baef21e1eea8505d78305b034dc80e)
    Reviewed-on: https://code.wireshark.org/review/13373
    Reviewed-by: Michael Mann <mmann78@xxxxxxxxxxxx>
    Petri-Dish: Michael Mann <mmann78@xxxxxxxxxxxx>
    Reviewed-by: Anders Broman <a.broman58@xxxxxxxxx>
    

Actions performed:

    from  32fc1bc   [LBMC] Bugfix stack-based buffer overflow in dissect_nhdr_extopt.
    adds  83dd13c   [iseries] fix iseries_check_file_type()


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