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

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

Commits:

3e1cd49 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/12329
    

Actions performed:

    from  9cf09cf   Fix out-of-bounds read in ascend_seek.
    adds  3e1cd49   [NBAP] Prevent crash.


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