diff options
| author | Pascal Quantin <pascal.quantin@gmail.com> | 2014-02-23 23:32:03 +0100 |
|---|---|---|
| committer | Pascal Quantin <pascal.quantin@gmail.com> | 2014-02-23 22:41:45 +0000 |
| commit | a8676c2fd756176136ec48c1dace955ebebe640c (patch) | |
| tree | 3bcd4f67aa926bcd57719ab5fac9fa8750cb990c /epan/dissectors/packet-gsm_a_dtap.c | |
| parent | 1678b0a825b41c0beb5fdfe6d43543a03b294ac8 (diff) | |
| download | wireshark-a8676c2fd756176136ec48c1dace955ebebe640c.tar.gz | |
Fix dissection of BCD numbers
Do not use of tvb_get_string(): what we really want is the byte string, not an ASCII string
Change-Id: I8b9a8b7ccacbdaf6d9525771ff8ed883ba01ad34
Reviewed-on: https://code.wireshark.org/review/329
Reviewed-by: Pascal Quantin <pascal.quantin@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, 5 insertions, 7 deletions
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++) |