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

URL: https://code.wireshark.org/review/gitweb?p=wireshark.git;a=commit;h=3a3ddbd43eaa5ac3b90d938a641f02cd2266bdf4
Submitter: Guy Harris (guy@xxxxxxxxxxxx)
Changed: branch: master-1.12
Repository: wireshark

Commits:

3a3ddbd by Guy Harris (guy@xxxxxxxxxxxx):

    Add bounds checks and fix a length argument.
    
    Before reading the record header of a REC_FRAME{2,4,6} record, make sure
    the record length is >= the length of that header.
    
    Whe calling fix_pseudo_header(), pass the actual length of the packet
    data, not the remaining length of the record (which may include
    padding), so we don't read past the end of the packet data.
    
    Bug: 11827
    Change-Id: I1c63a4cb014c4616ffdd202660e68c576f266872
    Reviewed-on: https://code.wireshark.org/review/12756
    Reviewed-by: Guy Harris <guy@xxxxxxxxxxxx>
    (cherry picked from commit 53a3e53fce30523d11ab3df319fba7b75d63076f)
    Reviewed-on: https://code.wireshark.org/review/12758
    

Actions performed:

    from  916c88e   [Automatic update for 2015-12-20]
    adds  3a3ddbd   Add bounds checks and fix a length argument.


Summary of changes:
 wiretap/ngsniffer.c |   49 ++++++++++++++++++++++++++++++++++---------------
 1 file changed, 34 insertions(+), 15 deletions(-)