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

URL: https://code.wireshark.org/review/gitweb?p=wireshark.git;a=commit;h=13bdc0f9721164b49cb0bf755c151c97cf430d70
Submitter: Balint Reczey (balint@xxxxxxxxxxxxxxx)
Changed: branch: lts-1.12.1
Repository: wireshark

Commits:

13bdc0f by Pascal Quantin (pascal.quantin@xxxxxxxxx):

    ATN-CPDLC: never put a break in a TRY block
    
    It will skip the execution of ENDTRY block
    
    Bug: 9952
    Change-Id: I55af248b7d31cf1b75aae695ef8c149367791820
    Reviewed-on: https://code.wireshark.org/review/7391
    Petri-Dish: Pascal Quantin <pascal.quantin@xxxxxxxxx>
    Tested-by: Petri Dish Buildbot <buildbot-no-reply@xxxxxxxxxxxxx>
    Reviewed-by: Pascal Quantin <pascal.quantin@xxxxxxxxx>
    (cherry picked from commit 1a3dd349233a4ee3e69295c8e79f9a216027037e)
    Conflicts:
    	epan/dissectors/packet-atn-cpdlc.c
    Reviewed-on: https://code.wireshark.org/review/7392
    Reviewed-on: https://code.wireshark.org/review/7702
    Reviewed-by: Peter Wu <peter@xxxxxxxxxxxxx>
    Reviewed-by: Balint Reczey <balint@xxxxxxxxxxxxxxx>
    Tested-by: Balint Reczey <balint@xxxxxxxxxxxxxxx>
    

Actions performed:

    from  0abe88b   Always set decrypt_len when setting decrypt.
    adds  13bdc0f   ATN-CPDLC: never put a break in a TRY block


Summary of changes:
 asn1/atn-cpdlc/packet-atn-cpdlc-template.c |   18 ++++++++++--------
 epan/dissectors/packet-atn-cpdlc.c         |   22 ++++++++++++----------
 2 files changed, 22 insertions(+), 18 deletions(-)