Wireshark-commits: [Wireshark-commits] lts-1.8.2 dbdff35: Add some additional checks in SnifferDeco
From: Wireshark code review <code-review-do-not-reply@xxxxxxxxxxxxx>
Date: Mon, 6 Oct 2014 18:54:24 +0000 (UTC)
URL: https://code.wireshark.org/review/gitweb?p=wireshark.git;a=commit;h=dbdff35463796eef5965cfbb47d8f005b042ca24
Submitter: Balint Reczey (balint@xxxxxxxxxxxxxxx)
Changed: branch: lts-1.8.2
Repository: wireshark

Commits:

dbdff35 by Guy Harris (guy@xxxxxxxxxxxx):

    Add some additional checks in SnifferDecompress().
    
    Check the input pointer in the while clause of the loop, so that we
    handle an empty input buffer.
    
    When reading a bit mask, check before fetching the bit mask that we have
    two bytes of bit mask and the byte after it.
    
    Before putting an uncompressed input byte into the output, make sure we
    wouldn't run past the end of the output buffer.
    
    Before copying an earlier string from the output buffer, make sure it
    doesn't run past the end of the data we've decompressed so far.
    
    Bug: 10461
    Change-Id: I8bb8d0d291368ae8bf0ac26970ff54d3262a7e6e
    Reviewed-on: https://code.wireshark.org/review/4083
    Reviewed-by: Guy Harris <guy@xxxxxxxxxxxx>
    (cherry picked from commit 47c592938ba9f0caeacc4c2ccadb370e72f293a2)
    Reviewed-on: https://code.wireshark.org/review/4085
    Reviewed-on: https://code.wireshark.org/review/4427
    Reviewed-by: Balint Reczey <balint@xxxxxxxxxxxxxxx>
    Tested-by: Balint Reczey <balint@xxxxxxxxxxxxxxx>
    

Actions performed:

    from  833afe3   ses: initialize pres_ctx_id in session struct
    adds  dbdff35   Add some additional checks in SnifferDecompress().


Summary of changes:
 wiretap/ngsniffer.c |   39 +++++++++++++++++++++++++++++----------
 1 file changed, 29 insertions(+), 10 deletions(-)