diff options
| author | Martin Mathieson <martin.r.mathieson@googlemail.com> | 2015-07-03 22:16:51 +0100 |
|---|---|---|
| committer | Martin Mathieson <martin.r.mathieson@googlemail.com> | 2015-07-03 21:17:56 +0000 |
| commit | 09ea473cee9ef37335f2ef8247da94bc71d12bba (patch) | |
| tree | 827b63b1ce9fddbd651a7cd9b564884f0deaad18 | |
| parent | ecc29ee7ecff81ba128e79813b856a87562c4754 (diff) | |
| download | wireshark-09ea473cee9ef37335f2ef8247da94bc71d12bba.tar.gz | |
bootp: try to fix OSX builtbot
Change-Id: I0204b6c947e302a6f38b43593e19c6b816a180a4
Reviewed-on: https://code.wireshark.org/review/9482
Reviewed-by: Martin Mathieson <martin.r.mathieson@googlemail.com>
| -rw-r--r-- | epan/dissectors/packet-bootp.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/epan/dissectors/packet-bootp.c b/epan/dissectors/packet-bootp.c index a659a8b7be..87568d9681 100644 --- a/epan/dissectors/packet-bootp.c +++ b/epan/dissectors/packet-bootp.c @@ -3665,8 +3665,8 @@ dissect_vendor_tr111_suboption(packet_info *pinfo, proto_item *v_ti, proto_tree else if (o125_tr111_opt[subopt].ftype == oui) { /* Get hex string. Expecting 6 characters. */ gchar *oui_string = tvb_get_string_enc(wmem_packet_scope(), tvb, suboptoff, subopt_len, ENC_ASCII); - /* Convert to OUI number */ - long oui_number = strtol(oui_string, NULL, 16); + /* Convert to OUI number. Only 3 bytes so no data lost in downcast. */ + guint32 oui_number = (guint32)strtol(oui_string, NULL, 16); /* Add item using oui_vals */ proto_tree_add_uint(v_tree, *o125_tr111_opt[subopt].phf, tvb, suboptoff, subopt_len, oui_number); } else if (o125_tr111_opt[subopt].phf == NULL) |