[Wireshark code review <code-review-do-not-reply@xxxxxxxxxxxxx>]

URL: https://code.wireshark.org/review/gitweb?p=wireshark.git;a=commit;h=780eae82e98cb311bb36dbb1e52ee1c0ba0dc141
Submitter: "Peter Wu <peter@xxxxxxxxxxxxx>"
Changed: branch: master-2.6
Repository: wireshark

Commits:

780eae8 by Peter Wu (peter@xxxxxxxxxxxxx):

    proto: fix proto_item_add_bitmask_tree with zero length
    
    packet-frame.c calls proto_item_add_bitmask_tree with a zero length, be
    sure not to trigger undefined behavior (right shift by 64). Observed
    with the capture from Bug 15247.
    
    Change-Id: I5b5b7f920a37365295603be7b915f51b39d99faf
    Fixes: v2.1.0rc0-1776-gb9fb2ceb88 ("Add heuristic dissectors for the variable part of COTP CR and CC PDUs.")
    Reviewed-on: https://code.wireshark.org/review/34108
    Petri-Dish: Peter Wu <peter@xxxxxxxxxxxxx>
    Tested-by: Petri Dish Buildbot
    Reviewed-by: Peter Wu <peter@xxxxxxxxxxxxx>
    (cherry picked from commit 77b6160696cf316434319ba83d49b074152241bd)
    Reviewed-on: https://code.wireshark.org/review/34127
    

Actions performed:

    from  17ae1c0   Qt: Fix coloring rules dialog
     add  780eae8   proto: fix proto_item_add_bitmask_tree with zero length


Summary of changes:
 epan/proto.c | 13 +++++++++----
 1 file changed, 9 insertions(+), 4 deletions(-)