Wireshark-commits: [Wireshark-commits] master-2.2 8937fe0: tvb_get_guintvar: don't overflow our ret

Date Prev · Date Next · Thread Prev · Thread Next
Date Index · Thread Index · Other Months · All Mailing Lists
From: Wireshark code review <code-review-do-not-reply@xxxxxxxxxxxxx>
Date: Sun, 03 Jun 2018 17:27:38 +0000
URL: https://code.wireshark.org/review/gitweb?p=wireshark.git;a=commit;h=8937fe0228544828263684e823f44b7af6df087e
Submitter: Guy Harris (guy@xxxxxxxxxxxx)
Changed: branch: master-2.2
Repository: wireshark

Commits:

8937fe0 by Martin Kaiser (wireshark@xxxxxxxxx):

    tvb_get_guintvar: don't overflow our return value
    
    tvb_get_guintvar() returns a guint. If we haven't seen the final byte
    after sizeof(guint) bytes, something is wrong. Abort and return 0.
    
    This is the minimum fix for
    
    Bug: 14473
    
    Change-Id: Ibe8a1239c1cbbeec0591c66710416bb56f9f60dc
    Reviewed-on: https://code.wireshark.org/review/26242
    Reviewed-by: Martin Kaiser <wireshark@xxxxxxxxx>
    Petri-Dish: Martin Kaiser <wireshark@xxxxxxxxx>
    Tested-by: Petri Dish Buildbot
    Reviewed-by: Anders Broman <a.broman58@xxxxxxxxx>
    (cherry picked from commit b475758123fde5fae476cd275958ac16d8eac7bd)
    Reviewed-on: https://code.wireshark.org/review/27994
    Reviewed-by: Guy Harris <guy@xxxxxxxxxxxx>
    

Actions performed:

    from  284a0c2   [Automatic update for 2018-06-03]
    adds  8937fe0   tvb_get_guintvar: don't overflow our return value


Summary of changes:
 epan/dissectors/packet-wap.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)