Wireshark-commits: [Wireshark-commits] master-2.0 fa117e7: [NBAP] Prevent crash.
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, 1 Dec 2015 05:58:51 +0000 (UTC)
URL: https://code.wireshark.org/review/gitweb?p=wireshark.git;a=commit;h=fa117e781ddc20de5986cdf1f1c4b038b90d7bd6
Submitter: Anders Broman (a.broman58@xxxxxxxxx)
Changed: branch: master-2.0
Repository: wireshark

Commits:

fa117e7 by Michael Mann (mmann78@xxxxxxxxxxxx):

    [NBAP] Prevent crash.
    
    If no previous conversation exists, a memcpy will try to copy from NULL destination.
    
    Bug: 11835
    Change-Id: I445480bb425834c5a918f1ffa148cb83d6c9750c
    Reviewed-on: https://code.wireshark.org/review/12326
    Reviewed-by: Michael Mann <mmann78@xxxxxxxxxxxx>
    Petri-Dish: Michael Mann <mmann78@xxxxxxxxxxxx>
    Tested-by: Petri Dish Buildbot <buildbot-no-reply@xxxxxxxxxxxxx>
    Reviewed-by: Anders Broman <a.broman58@xxxxxxxxx>
    (cherry picked from commit 5b4ada17723ed8af7e85cb48d537437ed614e417)
    Reviewed-on: https://code.wireshark.org/review/12328
    

Actions performed:

    from  e27455c   Qt: Don't expose ColorUtils::graph_colors_.
    adds  fa117e7   [NBAP] Prevent crash.


Summary of changes:
 asn1/nbap/nbap.cnf            |    5 ++--
 epan/dissectors/packet-nbap.c |   65 +++++++++++++++++++++--------------------
 2 files changed, 36 insertions(+), 34 deletions(-)