Wireshark-commits: [Wireshark-commits] master e2745d7: 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: Thu, 31 Mar 2016 22:01:34 +0000 (UTC)
URL: https://code.wireshark.org/review/gitweb?p=wireshark.git;a=commit;h=e2745d741ec11f395d41c0aafa24df9dec136399
Submitter: Michael Mann (mmann78@xxxxxxxxxxxx)
Changed: branch: master
Repository: wireshark

Commits:

e2745d7 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>
    

Actions performed:

    from  ac51b00   Remove trailing whitespace.
    adds  e2745d7   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(-)