diff options
| author | Dario Lombardo <lomato@gmail.com> | 2016-10-08 19:38:29 +0200 |
|---|---|---|
| committer | Michael Mann <mmann78@netscape.net> | 2016-10-09 11:46:57 +0000 |
| commit | 9b2dc3e769402163e74cd0d6cf0fe1ee8f4b9419 (patch) | |
| tree | d2fccc42fd218a2d0c9dcbf3c6c2ddb0f458c51d /epan/dissectors/packet-e212.c | |
| parent | 6c26ed90ddb3c823c8bf3bd80d0461d57da7aa5c (diff) | |
E212: use ws_strtou function.
Change-Id: Ifaeaf7ceb7addba95237852529ae1aa3e8a8b46b
Reviewed-on: https://code.wireshark.org/review/18124
Petri-Dish: Dario Lombardo <lomato@gmail.com>
Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org>
Reviewed-by: Michael Mann <mmann78@netscape.net>
Diffstat (limited to 'epan/dissectors/packet-e212.c')
| -rw-r--r-- | epan/dissectors/packet-e212.c | 15 |
1 files changed, 10 insertions, 5 deletions
diff --git a/epan/dissectors/packet-e212.c b/epan/dissectors/packet-e212.c index 4578823afc..bc6ddb0755 100644 --- a/epan/dissectors/packet-e212.c +++ b/epan/dissectors/packet-e212.c @@ -37,6 +37,8 @@ #include <epan/packet.h> +#include <wsutil/strtoi.h> + #include "packet-e212.h" #include "expert.h" @@ -3074,16 +3076,19 @@ dissect_e212_mcc_mnc_high_nibble(tvbuff_t *tvb, packet_info *pinfo _U_, proto_tr static int dissect_e212_mcc_mnc_in_utf8_address(tvbuff_t *tvb, packet_info *pinfo _U_, proto_tree *tree, int offset) { - guint16 mcc, mnc; + guint16 mcc = 0, mnc = 0; gboolean long_mnc = FALSE; - mcc = atoi(tvb_get_string_enc(wmem_packet_scope(), tvb, offset, 3, ENC_UTF_8)); - mnc = atoi(tvb_get_string_enc(wmem_packet_scope(), tvb, offset + 3, 2, ENC_UTF_8)); + ws_strtou16(tvb_get_string_enc(wmem_packet_scope(), tvb, offset, 3, ENC_UTF_8), + NULL, &mcc); + ws_strtou16(tvb_get_string_enc(wmem_packet_scope(), tvb, offset + 3, 2, ENC_UTF_8), + NULL, &mnc); /* Try to match the MCC and 2 digits MNC with an entry in our list of operators */ if (!try_val_to_str_ext(mcc * 1000 + 10 * mnc, &mcc_mnc_codes_ext)) { - mnc = atoi(tvb_get_string_enc(wmem_packet_scope(), tvb, offset + 3, 3, ENC_UTF_8)); - long_mnc = TRUE; + ws_strtou16(tvb_get_string_enc(wmem_packet_scope(), tvb, offset + 3, 3, ENC_UTF_8), + NULL, &mnc); + long_mnc = TRUE; } proto_tree_add_uint(tree, hf_E212_mcc, tvb, offset, 3, mcc ); |