diff options
| author | Guy Harris <guy@alum.mit.edu> | 2014-04-07 16:41:25 -0700 |
|---|---|---|
| committer | Guy Harris <guy@alum.mit.edu> | 2014-04-07 23:24:54 +0000 |
| commit | 8c7fae2da22371ff06a35d1aab28837d2db5a8ff (patch) | |
| tree | 1c95809be011aa425db05a1d2443f2acf4ebea79 /epan | |
| parent | 2b5fc4efdc2afd3349014669fb7bfad59c5d458c (diff) | |
Absolute and relative OIDs have different FT_ values.
This squelches some run-time dissector asserts.
Change-Id: I0ce33c4eb6e9c3bd371e47363a981e9a7a0dc789
Reviewed-on: https://code.wireshark.org/review/997
Reviewed-by: Guy Harris <guy@alum.mit.edu>
Diffstat (limited to 'epan')
| -rw-r--r-- | epan/dissectors/packet-ber.c | 6 |
1 files changed, 5 insertions, 1 deletions
diff --git a/epan/dissectors/packet-ber.c b/epan/dissectors/packet-ber.c index 05b17b4e7f..09aea83f42 100644 --- a/epan/dissectors/packet-ber.c +++ b/epan/dissectors/packet-ber.c @@ -100,6 +100,7 @@ static gint hf_ber_length = -1; static gint hf_ber_bitstring_padding = -1; static gint hf_ber_bitstring_empty = -1; static gint hf_ber_unknown_OID = -1; +static gint hf_ber_unknown_relative_OID = -1; static gint hf_ber_unknown_BOOLEAN = -1; static gint hf_ber_unknown_OCTETSTRING = -1; static gint hf_ber_unknown_BER_OCTETSTRING = -1; @@ -900,7 +901,7 @@ try_dissect_unknown_ber(packet_info *pinfo, tvbuff_t *tvb, volatile int offset, offset = dissect_ber_object_identifier_str(FALSE, &asn1_ctx, tree, tvb, start_offset, hf_ber_unknown_OID, NULL); break; case BER_UNI_TAG_RELATIVE_OID: - offset = dissect_ber_relative_oid_str(FALSE, &asn1_ctx, tree, tvb, start_offset, hf_ber_unknown_OID, NULL); + offset = dissect_ber_relative_oid_str(FALSE, &asn1_ctx, tree, tvb, start_offset, hf_ber_unknown_relative_OID, NULL); break; case BER_UNI_TAG_NumericString: offset = dissect_ber_octet_string(FALSE, &asn1_ctx, tree, tvb, start_offset, hf_ber_unknown_NumericString, NULL); @@ -5315,6 +5316,9 @@ proto_register_ber(void) { &hf_ber_unknown_OID, { "OID", "ber.unknown.OID", FT_OID, BASE_NONE, NULL, 0, "This is an unknown Object Identifier", HFILL }}, + { &hf_ber_unknown_relative_OID, { + "OID", "ber.unknown.relative_OID", FT_REL_OID, BASE_NONE, + NULL, 0, "This is an unknown relative Object Identifier", HFILL }}, { &hf_ber_unknown_GraphicString, { "GRAPHICSTRING", "ber.unknown.GRAPHICSTRING", FT_STRING, BASE_NONE, NULL, 0, "This is an unknown GRAPHICSTRING", HFILL }}, |