Wireshark-commits: [Wireshark-commits] master-2.4 ab8d15f: Restore pinfo->match_uint after the topm
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: Sat, 23 Mar 2019 19:41:09 +0000
URL: https://code.wireshark.org/review/gitweb?p=wireshark.git;a=commit;h=ab8d15f072bf70c0251e24c6ebc96ddbd60a16c6
Submitter: "Guy Harris <guy@xxxxxxxxxxxx>"
Changed: branch: master-2.4
Repository: wireshark

Commits:

ab8d15f by Guy Harris (guy@xxxxxxxxxxxx):

    Restore pinfo->match_uint after the topmost dissector returns.
    
    That's what dissector_try_uint_new() does, and some tests depend on it.
    
    Bug: 15630
    Change-Id: I57934a5e90f83ee6ea0eb539a91826c950530ad3
    Reviewed-on: https://code.wireshark.org/review/32542
    Petri-Dish: Guy Harris <guy@xxxxxxxxxxxx>
    Tested-by: Petri Dish Buildbot
    Reviewed-by: Guy Harris <guy@xxxxxxxxxxxx>
    (cherry picked from commit 80d96e91d248af40b50969702a0e5aafb7132376)
    Reviewed-on: https://code.wireshark.org/review/32545
    

Actions performed:

    from  6a1301c   TLS: fix potential buffer overflow with a malicious SSL 3.0 session
     add  ab8d15f   Restore pinfo->match_uint after the topmost dissector returns.


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