Wireshark-commits: [Wireshark-commits] master-2.0 6c9fc36: ieee80211: fix deep recursion
Date Index · Thread Index · Other Months · All Mailing Lists
Date Prev · Date Next · Thread Prev · Thread Next
From: Wireshark code review <code-review-do-not-reply@xxxxxxxxxxxxx>
Date: Fri, 1 Apr 2016 04:36:36 +0000 (UTC)
URL: https://code.wireshark.org/review/gitweb?p=wireshark.git;a=commit;h=6c9fc36488ac568d24779fe3854eff2516d761ac
Submitter: Anders Broman (a.broman58@xxxxxxxxx)
Changed: branch: master-2.0
Repository: wireshark

Commits:

6c9fc36 by Peter Wu (peter@xxxxxxxxxxxxx):

    ieee80211: fix deep recursion
    
    Restrict the list of possible (sub)elements to avoid deep recursion.
    
    Bug: 11824
    Bug: 12187
    Change-Id: I12deb9956c6ba9b6113cf45da4ee919e33ff8567
    Reviewed-on: https://code.wireshark.org/review/14114
    Reviewed-by: Peter Wu <peter@xxxxxxxxxxxxx>
    Petri-Dish: Peter Wu <peter@xxxxxxxxxxxxx>
    Tested-by: Petri Dish Buildbot <buildbot-no-reply@xxxxxxxxxxxxx>
    Reviewed-by: Michael Mann <mmann78@xxxxxxxxxxxx>
    (cherry picked from commit e2745d741ec11f395d41c0aafa24df9dec136399)
    Reviewed-on: https://code.wireshark.org/review/14741
    Petri-Dish: Michael Mann <mmann78@xxxxxxxxxxxx>
    Reviewed-by: Anders Broman <a.broman58@xxxxxxxxx>
    

Actions performed:

    from  a7fcd61   replace dangerous tvb_get_ptr with safer string function.
    adds  6c9fc36   ieee80211: fix deep recursion


Summary of changes:
 epan/dissectors/packet-capwap.c    |    2 +-
 epan/dissectors/packet-ieee80211.c |   60 ++++++++++++++++++++++++++++--------
 epan/dissectors/packet-ieee80211.h |    4 ++-
 3 files changed, 52 insertions(+), 14 deletions(-)