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 /asn1/atn-cpdlc | |
| parent | 618eaecee6ebcc533ffb74c1ea462b60b3899356 (diff) | |
| download | wireshark-1a3dd349233a4ee3e69295c8e79f9a216027037e.tar.gz | |
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 'asn1/atn-cpdlc')
| -rw-r--r-- | asn1/atn-cpdlc/packet-atn-cpdlc-template.c | 18 |
1 files changed, 10 insertions, 8 deletions
diff --git a/asn1/atn-cpdlc/packet-atn-cpdlc-template.c b/asn1/atn-cpdlc/packet-atn-cpdlc-template.c index 0e274bb11a..e127359873 100644 --- a/asn1/atn-cpdlc/packet-atn-cpdlc-template.c +++ b/asn1/atn-cpdlc/packet-atn-cpdlc-template.c @@ -218,17 +218,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;} @@ -238,17 +239,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;} |