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

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

Commits:

3325265 by Anish Bhatt (anish@xxxxxxxxxxx):

    NBAP : Verify conversation proto data exists before trying to access it
    
    
    Bug 11841
    Change-Id: Ic0dea6491a68a042ddc0f2dbee19739e4568b18c
    Reviewed-on: https://code.wireshark.org/review/12576
    Reviewed-by: Alexis La Goutte <alexis.lagoutte@xxxxxxxxx>
    Tested-by: Alexis La Goutte <alexis.lagoutte@xxxxxxxxx>
    Reviewed-by: Michael Mann <mmann78@xxxxxxxxxxxx>
    (cherry picked from commit 23379ae3624df82c170f48e5bb3250a97ec61c13)
    Reviewed-on: https://code.wireshark.org/review/12585
    (cherry picked from commit 254731ee05ab663fb79f3431ac0aa141b7065de0)
    Reviewed-on: https://code.wireshark.org/review/12586
    (cherry picked from commit 884d49c04ed79723586e9a031003487529a60f4d)
    Reviewed-on: https://code.wireshark.org/review/13773
    Reviewed-by: Balint Reczey <balint@xxxxxxxxxxxxxxx>
    

Actions performed:

    from  d6570ae   Increase ZBEE_ZCL_APPL_EVTALT_NUM_STRUCT_ETT to match ZBEE_ZCL_APPL_EVTALT_COUNT_NUM_MASK, to prevent invalid ett_ array access.
    adds  3325265   NBAP : Verify conversation proto data exists before trying to access it


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