diff options
| author | Michael Mann <mmann78@netscape.net> | 2015-11-27 21:05:32 -0500 |
|---|---|---|
| committer | Anders Broman <a.broman58@gmail.com> | 2015-11-29 00:02:49 +0000 |
| commit | cfc47c15c2b902a50764a21cbcd2ba1d78b1de7a (patch) | |
| tree | 988ff91986715e3c0d0f317ca25548bce025c369 /epan/dissectors/packet-gsm_a_dtap.c | |
| parent | efe1b7aa14bd0b3ca9b671fa0d9413124b58adfa (diff) | |
Replace my_dgt_tbcd_unpack with the safer tvb_bcd_dig_to_wmem_packet_str.
Bug: 11797
Change-Id: I07fdf3f7564424eac053f4c17de17f0d96597cca
Reviewed-on: https://code.wireshark.org/review/12239
Petri-Dish: Michael Mann <mmann78@netscape.net>
Reviewed-by: Anders Broman <a.broman58@gmail.com>
Diffstat (limited to 'epan/dissectors/packet-gsm_a_dtap.c')
| -rw-r--r-- | epan/dissectors/packet-gsm_a_dtap.c | 12 |
1 files changed, 1 insertions, 11 deletions
diff --git a/epan/dissectors/packet-gsm_a_dtap.c b/epan/dissectors/packet-gsm_a_dtap.c index 43e6cb9120..00da104fb1 100644 --- a/epan/dissectors/packet-gsm_a_dtap.c +++ b/epan/dissectors/packet-gsm_a_dtap.c @@ -2243,7 +2243,6 @@ const value_string gsm_a_dtap_screening_ind_values[] = { static guint16 de_bcd_num(tvbuff_t *tvb, proto_tree *tree, packet_info *pinfo, guint32 offset, guint len, int header_field, gboolean *address_extracted) { - guint8 *poctets; guint8 extension; guint32 curr_offset, num_string_len; proto_item *item; @@ -2270,19 +2269,10 @@ de_bcd_num(tvbuff_t *tvb, proto_tree *tree, packet_info *pinfo, guint32 offset, NO_MORE_DATA_CHECK(len); num_string_len = len - (curr_offset - offset); - poctets = (guint8 *)tvb_memdup(wmem_packet_scope(), tvb, curr_offset, num_string_len); - *address_extracted = TRUE; - my_dgt_tbcd_unpack(a_bigbuf, poctets, num_string_len, - &Dgt_mbcd); digit_str = tvb_bcd_dig_to_wmem_packet_str(tvb, curr_offset, num_string_len, NULL, FALSE); - proto_tree_add_string(tree, header_field, tvb, curr_offset, num_string_len, digit_str); - item = proto_tree_add_string_format(tree, header_field, - tvb, curr_offset, num_string_len, - a_bigbuf, - "BCD Digits: %s", - a_bigbuf); + item = proto_tree_add_string(tree, header_field, tvb, curr_offset, num_string_len, digit_str); /* Check for overdicadic digits, we used the standard digit map from tvbuff.c * 0 1 2 3 4 5 6 7 8 9 a b c d e f |