Wireshark-commits: [Wireshark-commits] master d923114: T125: avoid returning from TRY/CATCH in diss
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, 10 Oct 2018 04:07:11 +0000
URL: https://code.wireshark.org/review/gitweb?p=wireshark.git;a=commit;h=d9231144b652362eaf62f8595df7d4886dbaf44d
Submitter: "Anders Broman <a.broman58@xxxxxxxxx>"
Changed: branch: master
Repository: wireshark

Commits:

d923114 by Peter Wu (peter@xxxxxxxxxxxxx):

    T125: avoid returning from TRY/CATCH in dissect_t125_heur
    
    Doing so corrupts the exceptions stack and causes crashes elsewhere.
    Move the heuristics check after get_ber_identifier as dissect_t125
    calls that check too.
    
    Bug: 15189
    Change-Id: I816fcd693141c5e9e2979348f58bf5a8112290da
    Fixes: v2.9.0rc0-2122-gf710f21833 ("T125: Add a heuristic test case.")
    Reviewed-on: https://code.wireshark.org/review/30096
    Petri-Dish: Peter Wu <peter@xxxxxxxxxxxxx>
    Reviewed-by: Émilio Gonzalez <egg997@xxxxxxxxx>
    Petri-Dish: Gerald Combs <gerald@xxxxxxxxxxxxx>
    Tested-by: Petri Dish Buildbot
    Reviewed-by: Anders Broman <a.broman58@xxxxxxxxx>
    

Actions performed:

    from  1a9f074   OSITP: do not call subdissector if there is no data
     add  d923114   T125: avoid returning from TRY/CATCH in dissect_t125_heur


Summary of changes:
 epan/dissectors/asn1/t125/packet-t125-template.c | 53 ++++++++++------------
 epan/dissectors/packet-t125.c                    | 58 +++++++++++-------------
 2 files changed, 50 insertions(+), 61 deletions(-)