diff options
| author | Martin Kaiser <wireshark@kaiser.cx> | 2015-06-24 18:00:16 -0700 |
|---|---|---|
| committer | Martin Kaiser <wireshark@kaiser.cx> | 2015-06-25 01:02:24 +0000 |
| commit | 585f944f655d5220e5a285ee7c1cfe86b2a6f8a9 (patch) | |
| tree | dfbe397fb9356a033617532cf46f376584bf8268 /epan/dissectors/packet-acse.c | |
| parent | cdc7d2500469fe9cfe84d805957b8c3644cc27a1 (diff) | |
acse: don't THROW() an exception from a dissector
we already have an expert info, we can simply exit
Change-Id: I8adbfb084991195152a02bbef64c38c5aa9e841e
Reviewed-on: https://code.wireshark.org/review/9113
Reviewed-by: Martin Kaiser <wireshark@kaiser.cx>
Diffstat (limited to 'epan/dissectors/packet-acse.c')
| -rw-r--r-- | epan/dissectors/packet-acse.c | 9 |
1 files changed, 5 insertions, 4 deletions
diff --git a/epan/dissectors/packet-acse.c b/epan/dissectors/packet-acse.c index fdb97a06e4..5b2d1f75c8 100644 --- a/epan/dissectors/packet-acse.c +++ b/epan/dissectors/packet-acse.c @@ -1758,9 +1758,10 @@ dissect_acse(tvbuff_t *tvb, packet_info *pinfo, proto_tree *parent_tree, void* d if(strcmp(oid, ACSE_APDU_OID) == 0){ proto_tree_add_expert_format(parent_tree, pinfo, &ei_acse_invalid_oid, tvb, offset, -1, "Invalid OID: %s", ACSE_APDU_OID); - THROW(ReportedBoundsError); } - call_ber_oid_callback(oid, tvb, offset, pinfo, parent_tree, NULL); + else { + call_ber_oid_callback(oid, tvb, offset, pinfo, parent_tree, NULL); + } } else { proto_tree_add_expert(parent_tree, pinfo, &ei_acse_dissector_not_available, tvb, offset, -1); @@ -2248,7 +2249,7 @@ void proto_register_acse(void) { NULL, HFILL }}, /*--- End of included file: packet-acse-hfarr.c ---*/ -#line 268 "../../asn1/acse/packet-acse-template.c" +#line 269 "../../asn1/acse/packet-acse-template.c" }; /* List of subtrees */ @@ -2294,7 +2295,7 @@ void proto_register_acse(void) { &ett_acse_Authentication_value, /*--- End of included file: packet-acse-ettarr.c ---*/ -#line 274 "../../asn1/acse/packet-acse-template.c" +#line 275 "../../asn1/acse/packet-acse-template.c" }; static ei_register_info ei[] = { |