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

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

Commits:

7f80a97 by Michael Mann (mmann78@xxxxxxxxxxxx):

    Only use nibble logic to determine MPLS payload
    
    Bug: 11949
    
    Conflicts:
    	epan/dissectors/packet-mpls.c
    
    Change-Id: I625d80ce01918bd050889d21236aaa4cde4af8d0
    Reviewed-on: https://code.wireshark.org/review/12961
    Petri-Dish: Michael Mann <mmann78@xxxxxxxxxxxx>
    Tested-by: Petri Dish Buildbot <buildbot-no-reply@xxxxxxxxxxxxx>
    Reviewed-by: Michael Mann <mmann78@xxxxxxxxxxxx>
    Reviewed-on: https://code.wireshark.org/review/12997
    Reviewed-by: Alexis La Goutte <alexis.lagoutte@xxxxxxxxx>
    

Actions performed:

    from  af65213   Clean up error checking and handling.
    adds  7f80a97   Only use nibble logic to determine MPLS payload


Summary of changes:
 epan/dissectors/packet-mpls.c |   30 +++++++++++++-----------------
 1 file changed, 13 insertions(+), 17 deletions(-)