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

URL: https://code.wireshark.org/review/gitweb?p=wireshark.git;a=commit;h=09c024974b8754261b8f46f5782a408e71511cab
Submitter: Anders Broman (a.broman58@xxxxxxxxx)
Changed: branch: master-1.12
Repository: wireshark

Commits:

09c0249 by Jeff Morriss (jeff.morriss.ws@xxxxxxxxx):

    Fix dissection of JXTA over UDP.
    
    Prior to this change all JXTA-over-UDP frames throw an exception after setting
    COL_PROTOCOL.
    
    The offset used when adding the protocol to the tree had already been
    incremented to point to the end of the TVB; use tree_offset (which is the
    current offset) instead.
    
    This code has been here since r17282 (2006) so presumably the change is that
    proto_tree_add_protocol_format() started throwing an exception when offset
    points to the end of the TVB sometime between then and now.
    
    Change-Id: Iadbcada29cd235e8abe5662b825a2d97ff6f7308
    Reviewed-on: https://code.wireshark.org/review/15560
    Petri-Dish: Jeff Morriss <jeff.morriss.ws@xxxxxxxxx>
    Tested-by: Petri Dish Buildbot <buildbot-no-reply@xxxxxxxxxxxxx>
    Reviewed-by: Michael Mann <mmann78@xxxxxxxxxxxx>
    (cherry picked from commit 0bc1cdd9f3692e953bae2ce47fe58e5a0ab7ffd2)
    Reviewed-on: https://code.wireshark.org/review/15567
    Reviewed-by: Anders Broman <a.broman58@xxxxxxxxx>
    

Actions performed:

    from  2297b62   Fix previous change.
    adds  09c0249   Fix dissection of JXTA over UDP.


Summary of changes:
 epan/dissectors/packet-jxta.c |    4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)