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

URL: https://code.wireshark.org/review/gitweb?p=wireshark.git;a=commit;h=605a01e873ae74d2a355adf4250aa9f444ed2931
Submitter: Balint Reczey (balint@xxxxxxxxxxxxxxx)
Changed: branch: lts-1.12.1
Repository: wireshark

Commits:

605a01e by Pascal Quantin (pascal.quantin@xxxxxxxxx):

    NBAP: avoid dereferencing a NULL pointer
    
    Bug: 11602
    Change-Id: I56b9db19eca416c288f36c1f3a4faa7e22b38c8f
    Reviewed-on: https://code.wireshark.org/review/11109
    Reviewed-by: Pascal Quantin <pascal.quantin@xxxxxxxxx>
    Petri-Dish: Pascal Quantin <pascal.quantin@xxxxxxxxx>
    Tested-by: Petri Dish Buildbot <buildbot-no-reply@xxxxxxxxxxxxx>
    Reviewed-by: Alexis La Goutte <alexis.lagoutte@xxxxxxxxx>
    (cherry picked from commit 5bf565690ad9f0771196d8fa237aa37fae3bb7cc)
    Conflicts:
    	epan/dissectors/packet-nbap.c
    Reviewed-on: https://code.wireshark.org/review/11116
    (cherry picked from commit daa562cecc397fb9491820e552d9fb6cf95b6b72)
    Reviewed-on: https://code.wireshark.org/review/13748
    Reviewed-by: Balint Reczey <balint@xxxxxxxxxxxxxxx>
    

Actions performed:

    from  04ae697   pcapng: Fixed copying if_filter_bpf_bytes
    adds  605a01e   NBAP: avoid dereferencing a NULL pointer


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