Wireshark-commits: [Wireshark-commits] master-2.2 ce92f90: merge.c: do not give a NULL pointer when

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 Oct 2016 21:51:38 +0000 (UTC)
URL: https://code.wireshark.org/review/gitweb?p=wireshark.git;a=commit;h=ce92f90e42ce0da7491b1ef9aa8a9c6f2261cf69
Submitter: Guy Harris (guy@xxxxxxxxxxxx)
Changed: branch: master-2.2
Repository: wireshark

Commits:

ce92f90 by Pascal Quantin (pascal.quantin@xxxxxxxxx):

    merge.c: do not give a NULL pointer when saving SHB comment option
    
    Bug: 13060
    Change-Id: Ib3dd019f73305e4006b312d324502e4a138c6a16
    Reviewed-on: https://code.wireshark.org/review/18514
    Reviewed-by: Pascal Quantin <pascal.quantin@xxxxxxxxx>
    Petri-Dish: Pascal Quantin <pascal.quantin@xxxxxxxxx>
    Reviewed-by: Guy Harris <guy@xxxxxxxxxxxx>
    (cherry picked from commit 1fae14257a8a7ade813930097a12dd3e555a9f76)
    Reviewed-on: https://code.wireshark.org/review/18515
    

Actions performed:

    from  d7ad4f9   Update libssh to 0.7.3
    adds  ce92f90   merge.c: do not give a NULL pointer when saving SHB comment option


Summary of changes:
 wiretap/merge.c |    4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)