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

URL: https://code.wireshark.org/review/gitweb?p=wireshark.git;a=commit;h=849d87af1cb9f3e19222e452fd76483244375a03
Submitter: Alexis La Goutte (alexis.lagoutte@xxxxxxxxx)
Changed: branch: master
Repository: wireshark

Commits:

849d87a by Pascal Quantin (pascal.quantin@xxxxxxxxx):

    PPP: fix registration of CRTP (CNTCP) protocol
    
    Also protect against any badly registered protocol
    
    Bug: 11958
    Change-Id: I0c03f50c2c5478a9524ad06e669510ffb5739b21
    Reviewed-on: https://code.wireshark.org/review/13041
    Reviewed-by: Michael Mann <mmann78@xxxxxxxxxxxx>
    Petri-Dish: Michael Mann <mmann78@xxxxxxxxxxxx>
    Tested-by: Petri Dish Buildbot <buildbot-no-reply@xxxxxxxxxxxxx>
    Reviewed-by: Alexis La Goutte <alexis.lagoutte@xxxxxxxxx>
    

Actions performed:

    from  28287ec   cli: packets / bytes conversation statistics are swapped
    adds  849d87a   PPP: fix registration of CRTP (CNTCP) protocol


Summary of changes:
 epan/dissectors/packet-ppp.c |    1 +
 ui/decode_as_utils.c         |    3 ++-
 2 files changed, 3 insertions(+), 1 deletion(-)