Wireshark-commits: [Wireshark-commits] master-2.6 ef5c87e: frame: fix crash when dissectors add the
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: Wed, 13 Feb 2019 13:33:12 +0000
URL: https://code.wireshark.org/review/gitweb?p=wireshark.git;a=commit;h=ef5c87ebd56e33a1c98c507c6a3ec596dc0f57b8
Submitter: "Peter Wu <peter@xxxxxxxxxxxxx>"
Changed: branch: master-2.6
Repository: wireshark

Commits:

ef5c87e by Dario Lombardo (lomato@xxxxxxxxx):

    frame: fix crash when dissectors add the maximum number of tree items.
    
    When underlying dissectors exceed MAX_TREE_ITEMS, the frame dissector
    will fail when adding more items. We make room for the following items
    by decrementing the count for the current tree before adding them.
    
    This change will fix all errors where underlying dissectors add MAX_TREE_ITEMS
    items to the tree.
    
    Bug: 15448
    Change-Id: I03f3191cf1b737ac9ab569fbe5bf77f3a30e2401
    Reviewed-on: https://code.wireshark.org/review/31975
    Petri-Dish: Peter Wu <peter@xxxxxxxxxxxxx>
    Tested-by: Petri Dish Buildbot
    Reviewed-by: Dario Lombardo <lomato@xxxxxxxxx>
    Tested-by: Dario Lombardo <lomato@xxxxxxxxx>
    Reviewed-by: Peter Wu <peter@xxxxxxxxxxxxx>
    (cherry picked from commit c96b56d384391b1fe18da468548e2fcf3c8c4eeb)
    Reviewed-on: https://code.wireshark.org/review/32007
    

Actions performed:

    from  322fefb   DCM: Fix offset for protocol version
     add  ef5c87e   frame: fix crash when dissectors add the maximum number of tree items.


Summary of changes:
 epan/dissectors/packet-frame.c | 23 +++++++++++++++++++++++
 1 file changed, 23 insertions(+)