diff options
Diffstat (limited to 'epan/dissectors')
-rw-r--r-- | epan/dissectors/packet-gsm_a_common.c | 8 | ||||
-rw-r--r-- | epan/dissectors/packet-gsm_a_dtap.c | 12 |
2 files changed, 8 insertions, 12 deletions
diff --git a/epan/dissectors/packet-gsm_a_common.c b/epan/dissectors/packet-gsm_a_common.c index 3680e03a2e..b676e20b30 100644 --- a/epan/dissectors/packet-gsm_a_common.c +++ b/epan/dissectors/packet-gsm_a_common.c @@ -6,8 +6,6 @@ * * Split from packet-gsm_a.c by Neil Piercy <Neil [AT] littlebriars.co.uk> * - * $Id$ - * * Wireshark - Network traffic analyzer * By Gerald Combs <gerald@wireshark.org> * Copyright 1998 Gerald Combs @@ -1927,14 +1925,14 @@ guint16 elem_v_short(tvbuff_t *tvb, proto_tree *tree, packet_info *pinfo, gint p static dgt_set_t Dgt_tbcd = { { - /* 0 1 2 3 4 5 6 7 8 9 a b c d e */ + /* 0 1 2 3 4 5 6 7 8 9 a b c d e f */ '0','1','2','3','4','5','6','7','8','9','?','B','C','*','#','?' } }; static dgt_set_t Dgt1_9_bcd = { { - /* 0 1 2 3 4 5 6 7 8 9 a b c d e */ + /* 0 1 2 3 4 5 6 7 8 9 a b c d e f */ '0','1','2','3','4','5','6','7','8','9','?','?','?','?','?','?' } }; @@ -2288,7 +2286,7 @@ de_mid(tvbuff_t *tvb, proto_tree *tree, packet_info *pinfo, guint32 offset, guin a_bigbuf[0] = Dgt1_9_bcd.out[(oct & 0xf0) >> 4]; curr_offset++; - poctets = tvb_get_string(wmem_packet_scope(), tvb, curr_offset, len - (curr_offset - offset)); + poctets = (guint8 *)tvb_memdup(wmem_packet_scope(), tvb, curr_offset, len - (curr_offset - offset)); my_dgt_tbcd_unpack(&a_bigbuf[1], poctets, len - (curr_offset - offset), &Dgt1_9_bcd); diff --git a/epan/dissectors/packet-gsm_a_dtap.c b/epan/dissectors/packet-gsm_a_dtap.c index c2fa7729b2..044d20ebb9 100644 --- a/epan/dissectors/packet-gsm_a_dtap.c +++ b/epan/dissectors/packet-gsm_a_dtap.c @@ -78,8 +78,6 @@ * Stage 3 * (3GPP TS 24.008 version 11.6.0 Release 11) * - * $Id$ - * * Wireshark - Network traffic analyzer * By Gerald Combs <gerald@wireshark.org> * Copyright 1998 Gerald Combs @@ -661,8 +659,8 @@ gint ett_gsm_dtap_elem[NUM_GSM_DTAP_ELEM]; static dgt_set_t Dgt_mbcd = { { - /* 0 1 2 3 4 5 6 7 8 9 a b c d e */ - '0','1','2','3','4','5','6','7','8','9','*','#','a','b','c','?' + /* 0 1 2 3 4 5 6 7 8 9 a b c d e f */ + '0','1','2','3','4','5','6','7','8','9','*','#','a','b','c','?' } }; @@ -1102,7 +1100,7 @@ de_emerg_num_list(tvbuff_t *tvb, proto_tree *tree, packet_info *pinfo, guint32 o curr_offset++; en_len--; - poctets = tvb_get_string(wmem_packet_scope(), tvb, curr_offset, en_len); + poctets = (guint8 *)tvb_memdup(wmem_packet_scope(), tvb, curr_offset, en_len); my_dgt_tbcd_unpack(a_bigbuf, poctets, en_len, &Dgt_mbcd); @@ -2206,7 +2204,7 @@ 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 = tvb_get_string(wmem_packet_scope(), tvb, curr_offset, num_string_len); + 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, @@ -2287,7 +2285,7 @@ de_sub_addr(tvbuff_t *tvb, proto_tree *tree, packet_info *pinfo, guint32 offset, if (afi == 0x50) { ia5_string_len = len - (curr_offset - offset); - ia5_string = tvb_get_string(wmem_packet_scope(), tvb, curr_offset, ia5_string_len); + ia5_string = (guint8 *)tvb_memdup(wmem_packet_scope(), tvb, curr_offset, ia5_string_len); invalid_ia5_char = FALSE; for(i = 0; i < ia5_string_len; i++) |