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

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

Commits:

b2bbd9f by Peter Wu (peter@xxxxxxxxxxxxx):

    coap: ensure that piv_len matches piv
    
    In frame 121, piv_len was 1 while piv was NULL. Ensure that both piv and
    piv_len are reset to avoid this. Adjust another check to ensure that piv
    and piv_len are in sync (probably not necessary, but it seems the
    intention).
    
    Bug: 15172
    Change-Id: If8636d32f3273d6707749c807bd7d676ca9ab96d
    Fixes: v2.5.2rc0-9-g830ea5731a ("CoAP: Hooks to OSCORE")
    Reviewed-on: https://code.wireshark.org/review/30100
    Petri-Dish: Peter Wu <peter@xxxxxxxxxxxxx>
    Petri-Dish: Gerald Combs <gerald@xxxxxxxxxxxxx>
    Tested-by: Petri Dish Buildbot
    Reviewed-by: Anders Broman <a.broman58@xxxxxxxxx>
    (cherry picked from commit 5a2aafef7a8ad4b3917823133c2e3534951fc4d3)
    Reviewed-on: https://code.wireshark.org/review/30111
    Reviewed-by: Peter Wu <peter@xxxxxxxxxxxxx>
    

Actions performed:

    from  7571da4   ftype-protocol: do not return from TRY/CATCH
     add  b2bbd9f   coap: ensure that piv_len matches piv


Summary of changes:
 epan/dissectors/packet-coap.c | 11 ++++++-----
 1 file changed, 6 insertions(+), 5 deletions(-)