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

URL: https://code.wireshark.org/review/gitweb?p=wireshark.git;a=commit;h=e42468564b566baa66b1a7991fe5e9868183f4ac
Submitter: Michael Mann (mmann78@xxxxxxxxxxxx)
Changed: branch: master-2.0
Repository: wireshark

Commits:

e424685 by Pascal Quantin (pascal.quantin@xxxxxxxxx):

    NBAP: fix malformed packet error when having a single byte BindingID
    
    The tvb length must be checked before trying to read 2 bytes
    
    Bug: 13577
    Change-Id: I8ba8320b3a0a96239e52a36bc09bb6b41e65a657
    Reviewed-on: https://code.wireshark.org/review/20991
    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: Michael Mann <mmann78@xxxxxxxxxxxx>
    (cherry picked from commit 2861b38153b9d78f6129081bc7dd50e853ca1a0e)
    Conflicts:
    	epan/dissectors/asn1/nbap/nbap.cnf
    Reviewed-on: https://code.wireshark.org/review/21006
    

Actions performed:

    from  758749f   RTPproxy: use tvb_format_text() to add text to info column
    adds  e424685   NBAP: fix malformed packet error when having a single byte BindingID


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