Wireshark-commits: [Wireshark-commits] master-2.2 1a32fc1: dmp: Allow multiple SecurityCategories a
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, 23 Feb 2018 07:21:17 +0000
URL: https://code.wireshark.org/review/gitweb?p=wireshark.git;a=commit;h=1a32fc1ee3ab40bfec1336d856f40c3bb77ea70b
Submitter: Stig Bjørlykke (stig@xxxxxxxxxxxxx)
Changed: branch: master-2.2
Repository: wireshark

Commits:

1a32fc1 by Stig Bjørlykke (stig@xxxxxxxxxxxxx):

    dmp: Allow multiple SecurityCategories again
    
    A Security Classification in DMP may have multiple Security Categories
    so don't restrict this to only one.  Add a arbitrary limit of 255 to
    avoid a long dissector loop in malformed packets.
    
    This fixes a bug introduced in g85bbda51.
    
    Bug: 14408
    Change-Id: I48e7a61a097c58dfcf21e9c9ed3147cf1573dae6
    Reviewed-on: https://code.wireshark.org/review/26011
    Petri-Dish: Stig Bjørlykke <stig@xxxxxxxxxxxxx>
    Tested-by: Petri Dish Buildbot
    Reviewed-by: Gerald Combs <gerald@xxxxxxxxxxxxx>
    (cherry picked from commit f14f76d12a3107f0a89884f084640925ba033b28)
    Reviewed-on: https://code.wireshark.org/review/26042
    Reviewed-by: Stig Bjørlykke <stig@xxxxxxxxxxxxx>
    

Actions performed:

    from  5e0e2b6   Get rid of the -sdkroot option; it doesn't affect anything.
    adds  1a32fc1   dmp: Allow multiple SecurityCategories again


Summary of changes:
 epan/dissectors/packet-dmp.c | 34 ++++++++++++++++++++++++----------
 1 file changed, 24 insertions(+), 10 deletions(-)