Wireshark-commits: [Wireshark-commits] master b5eb01c: ssl: fix crash when setting RSA key file wit
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: Tue, 27 Sep 2016 03:50:03 +0000 (UTC)
URL: https://code.wireshark.org/review/gitweb?p=wireshark.git;a=commit;h=b5eb01c1a5219f075897b1cc5bc8f1883262af3b
Submitter: Anders Broman (a.broman58@xxxxxxxxx)
Changed: branch: master
Repository: wireshark

Commits:

b5eb01c by Peter Wu (peter@xxxxxxxxxxxxx):

    ssl: fix crash when setting RSA key file without valid protocol
    
    If ssl_association_add is passed a NULL app_handle argument, it will
    trigger DISSECTOR_ASSERT which fails due to the bad wmem scope
    (wmem_packet_scope). Arguably DISSECTOR_ASSERT should not be used there,
    but its alternative is g_warning/g_assert are not much different...
    
    Fix the crash (assertion failure) by checking that the UAT-supplied
    protocol is really valid. Normally the post_update_cb should not be
    invoked if any of the fields are invalid, but that requires larger
    changes in the Qt UAT dialog code.
    
    Change-Id: Ie245213b650b1de9640db8dadd08f3ed2bff335f
    Reviewed-on: https://code.wireshark.org/review/17906
    Petri-Dish: Alexis La Goutte <alexis.lagoutte@xxxxxxxxx>
    Tested-by: Petri Dish Buildbot <buildbot-no-reply@xxxxxxxxxxxxx>
    Reviewed-by: Michael Mann <mmann78@xxxxxxxxxxxx>
    Reviewed-by: Anders Broman <a.broman58@xxxxxxxxx>
    

Actions performed:

    from  7bca5e1   pcep: Added missed pieces of RFC 6006 support.
    adds  b5eb01c   ssl: fix crash when setting RSA key file without valid protocol


Summary of changes:
 epan/dissectors/packet-ssl-utils.c |    4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)