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

URL: https://code.wireshark.org/review/gitweb?p=wireshark.git;a=commit;h=6a77ad9ea439cb0d3d212a345f9c3cac30e084d4
Submitter: Evan Huus (eapache@xxxxxxxxx)
Changed: branch: master-1.10
Repository: wireshark

Commits:

6a77ad9 by Jeff Morriss (jeff.morriss.ws@xxxxxxxxx):

    Manually apply https://code.wireshark.org/review/1289 to master-1.10:
    
    Fix up get_hfi_and_length():
    
    Treat FT_BYTES and a few others the same as FT_PROTOCOL: allow a zero length
    but throw an exception if the offset is already beyond the end of the TVB
    (prior to this change it would assert out).  This (when manually applied to
    master-1.10) fixes https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=9999 .
    
    Use tvb_ensure_captured_length_remaining() to throw an exception if the offset
    is bad.
    
    Change-Id: Ibc61cc9ac331b669c688611ee9f23d36479378ef
    Reviewed-on: https://code.wireshark.org/review/1290
    Reviewed-by: Alexis La Goutte <alexis.lagoutte@xxxxxxxxx>
    Reviewed-by: Evan Huus <eapache@xxxxxxxxx>
    

Actions performed:

    from  5cdb0c3   Don't use -1 as length in frame dissector.
    adds  6a77ad9   Manually apply https://code.wireshark.org/review/1289 to master-1.10:


Summary of changes:
 epan/proto.c |   36 ++++++++++++++----------------------
 1 file changed, 14 insertions(+), 22 deletions(-)