diff options
| author | Pascal Quantin <pascal.quantin@gmail.com> | 2015-02-25 17:49:31 +0100 |
|---|---|---|
| committer | Pascal Quantin <pascal.quantin@gmail.com> | 2015-02-25 18:14:21 +0000 |
| commit | 1a3dd349233a4ee3e69295c8e79f9a216027037e (patch) | |
| tree | 55b7f8bf4b31f6c6a817834178ceb447cc5faf1c /epan/dissectors/packet-atn-cpdlc.c | |
| parent | 618eaecee6ebcc533ffb74c1ea462b60b3899356 (diff) | |
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@gmail.com>
Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org>
Reviewed-by: Pascal Quantin <pascal.quantin@gmail.com>
Diffstat (limited to 'epan/dissectors/packet-atn-cpdlc.c')
| -rw-r--r-- | epan/dissectors/packet-atn-cpdlc.c | 22 |
1 files changed, 12 insertions, 10 deletions
diff --git a/epan/dissectors/packet-atn-cpdlc.c b/epan/dissectors/packet-atn-cpdlc.c index 6d4a5749b3..9660695e37 100644 --- a/epan/dissectors/packet-atn-cpdlc.c +++ b/epan/dissectors/packet-atn-cpdlc.c @@ -5427,17 +5427,18 @@ dissect_atn_cpdlc_heur( TRY { dissect_ProtectedGroundPDUs_PDU(tvb, pinfo, NULL, NULL); is_atn_cpdlc = TRUE; - is_pm = TRUE; - break;} + is_pm = TRUE;} CATCH_ALL{ is_atn_cpdlc = FALSE; is_pm = FALSE;} ENDTRY; + if (is_atn_cpdlc) { + break; + } TRY { dissect_GroundPDUs_PDU(tvb, pinfo, NULL, NULL); is_pm = FALSE; - is_atn_cpdlc = TRUE; - break;} + is_atn_cpdlc = TRUE;} CATCH_ALL{ is_atn_cpdlc = FALSE; is_pm = FALSE;} @@ -5447,17 +5448,18 @@ dissect_atn_cpdlc_heur( TRY { dissect_ProtectedAircraftPDUs_PDU(tvb, pinfo, NULL, NULL); is_atn_cpdlc = TRUE; - is_pm = TRUE; - break;} + is_pm = TRUE;} CATCH_ALL { is_atn_cpdlc = FALSE; is_pm = FALSE; } ENDTRY; + if (is_atn_cpdlc) { + break; + } TRY{ dissect_AircraftPDUs_PDU(tvb, pinfo, NULL, NULL); is_atn_cpdlc = TRUE; - is_pm = FALSE; - break;} + is_pm = FALSE;} CATCH_ALL{ is_atn_cpdlc = FALSE; is_pm = FALSE;} @@ -7921,7 +7923,7 @@ void proto_register_atn_cpdlc (void) NULL, HFILL }}, /*--- End of included file: packet-atn-cpdlc-hfarr.c ---*/ -#line 307 "../../asn1/atn-cpdlc/packet-atn-cpdlc-template.c" +#line 309 "../../asn1/atn-cpdlc/packet-atn-cpdlc-template.c" }; static gint *ett[] = { @@ -8072,7 +8074,7 @@ void proto_register_atn_cpdlc (void) &ett_atn_cpdlc_WindSpeed, /*--- End of included file: packet-atn-cpdlc-ettarr.c ---*/ -#line 311 "../../asn1/atn-cpdlc/packet-atn-cpdlc-template.c" +#line 313 "../../asn1/atn-cpdlc/packet-atn-cpdlc-template.c" &ett_atn_cpdlc }; |