Wireshark-commits: [Wireshark-commits] master-2.6 cd4b3f5: ISAKMP: Fix a crash when no decryption d

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: Thu, 27 Dec 2018 17:48:01 +0000
URL: https://code.wireshark.org/review/gitweb?p=wireshark.git;a=commit;h=cd4b3f5d692cf0be7a4811d406f79cbd84fc5c45
Submitter: "Michael Mann <mmann78@xxxxxxxxxxxx>"
Changed: branch: master-2.6
Repository: wireshark

Commits:

cd4b3f5 by Jaap Keuter (jaap.keuter@xxxxxxxxx):

    ISAKMP: Fix a crash when no decryption data block is there
    
    Don't try to (re)set parameters in a struct when its pointer
    points to NULL.
    
    Bug: 15374
    Change-Id: I953e82795990fde5fce2ad6d955781b372a9e405
    Signed-off-by: Jaap Keuter <jaap.keuter@xxxxxxxxx>
    Reviewed-on: https://code.wireshark.org/review/31189
    Tested-by: Petri Dish Buildbot
    Reviewed-by: Michael Mann <mmann78@xxxxxxxxxxxx>
    (cherry picked from commit c9cfae7fecd4bc21b8b4f48328d08e104d47dd52)
    Reviewed-on: https://code.wireshark.org/review/31219
    Petri-Dish: Michael Mann <mmann78@xxxxxxxxxxxx>
    

Actions performed:

    from  5cc713c   [Automatic update for 2018-12-23]
     add  cd4b3f5   ISAKMP: Fix a crash when no decryption data block is there


Summary of changes:
 epan/dissectors/packet-isakmp.c | 27 ++++++++++++++-------------
 1 file changed, 14 insertions(+), 13 deletions(-)