diff options
Diffstat (limited to 'epan/dissectors/packet-ansi_map.c')
| -rw-r--r-- | epan/dissectors/packet-ansi_map.c | 22 |
1 files changed, 15 insertions, 7 deletions
diff --git a/epan/dissectors/packet-ansi_map.c b/epan/dissectors/packet-ansi_map.c index 793389b34b..96fab2fa69 100644 --- a/epan/dissectors/packet-ansi_map.c +++ b/epan/dissectors/packet-ansi_map.c @@ -1487,14 +1487,18 @@ dissect_ansi_map_digits_type(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree proto_item_append_text(actx->created_item, " - %s", digit_str); break; case 2: + { + const guint8* digits; /* IA5 Coding */ octet_len = tvb_get_guint8(tvb,offset); proto_tree_add_item(subtree, hf_ansi_map_nr_digits, tvb, offset, 1, ENC_BIG_ENDIAN); if(octet_len == 0) return; offset++; - proto_tree_add_item(subtree, hf_ansi_map_ia5_digits, tvb, offset, -1, ENC_ASCII|ENC_NA); - proto_item_append_text(actx->created_item, " - %s", tvb_get_string_enc(wmem_packet_scope(),tvb,offset,tvb_reported_length_remaining(tvb,offset),ENC_ASCII|ENC_NA)); + proto_tree_add_item_ret_string(subtree, hf_ansi_map_ia5_digits, tvb, offset, tvb_reported_length_remaining(tvb,offset), + ENC_ASCII|ENC_NA, wmem_packet_scope(), &digits); + proto_item_append_text(actx->created_item, " - %s", digits); + } break; case 3: /* Octet string */ @@ -1525,9 +1529,13 @@ dissect_ansi_map_digits_type(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree proto_item_append_text(actx->created_item, " - %s", digit_str); break; case 2: + { + const guint8* digits; /* IA5 Coding */ - proto_tree_add_item(subtree, hf_ansi_map_ia5_digits, tvb, offset, -1, ENC_ASCII|ENC_NA); - proto_item_append_text(actx->created_item, " - %s", tvb_get_string_enc(wmem_packet_scope(),tvb,offset,tvb_reported_length_remaining(tvb,offset),ENC_ASCII|ENC_NA)); + proto_tree_add_item_ret_string(subtree, hf_ansi_map_ia5_digits, tvb, offset, tvb_reported_length_remaining(tvb,offset), + ENC_ASCII|ENC_NA, wmem_packet_scope(), &digits); + proto_item_append_text(actx->created_item, " - %s", digits); + } break; case 3: /* Octet string */ @@ -15278,7 +15286,7 @@ dissect_ansi_map_QualificationRequest2Res(gboolean implicit_tag _U_, tvbuff_t *t /*--- End of included file: packet-ansi_map-fn.c ---*/ -#line 3633 "./asn1/ansi_map/packet-ansi_map-template.c" +#line 3641 "./asn1/ansi_map/packet-ansi_map-template.c" /* * 6.5.2.dk N.S0013-0 v 1.0,X.S0004-550-E v1.0 2.301 @@ -19227,7 +19235,7 @@ void proto_register_ansi_map(void) { NULL, HFILL }}, /*--- End of included file: packet-ansi_map-hfarr.c ---*/ -#line 5389 "./asn1/ansi_map/packet-ansi_map-template.c" +#line 5397 "./asn1/ansi_map/packet-ansi_map-template.c" }; /* List of subtrees */ @@ -19488,7 +19496,7 @@ void proto_register_ansi_map(void) { &ett_ansi_map_ReturnData, /*--- End of included file: packet-ansi_map-ettarr.c ---*/ -#line 5422 "./asn1/ansi_map/packet-ansi_map-template.c" +#line 5430 "./asn1/ansi_map/packet-ansi_map-template.c" }; static ei_register_info ei[] = { |