diff options
| author | Jeff Morriss <jeff.morriss@ulticom.com> | 2011-01-16 03:29:03 +0000 |
|---|---|---|
| committer | Jeff Morriss <jeff.morriss@ulticom.com> | 2011-01-16 03:29:03 +0000 |
| commit | 067a0761790aabf2d6a829c59dbdac4c2d0fccdf (patch) | |
| tree | ee4e7efac0f2d4a12f25d92b0b1fd222f1e47587 /epan/dissectors/packet-fddi.c | |
| parent | 1f19cd8f1b95aa5cfef763d266724e01a1c579e2 (diff) | |
| download | wireshark-067a0761790aabf2d6a829c59dbdac4c2d0fccdf.tar.gz | |
Use tvb_ip_to_str().
There's no need to pass the result of tvb_get_ptr() as the 'value' in
proto_tree_add_*(): just use proto_tree_add_item().
Replace some tvb_get_ptr()s with tvb_get_ephemeral_string()s to ensure the
return string is NULL terminated.
svn path=/trunk/; revision=35545
Diffstat (limited to 'epan/dissectors/packet-fddi.c')
| -rw-r--r-- | epan/dissectors/packet-fddi.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/epan/dissectors/packet-fddi.c b/epan/dissectors/packet-fddi.c index 8051685206..26b960dc8f 100644 --- a/epan/dissectors/packet-fddi.c +++ b/epan/dissectors/packet-fddi.c @@ -320,7 +320,7 @@ dissect_fddi(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree, if (bitswapped) swap_mac_addr(dst, tvb_get_ptr(tvb, FDDI_P_DHOST + FDDI_PADDING, 6)); else - memcpy(dst, tvb_get_ptr(tvb, FDDI_P_DHOST + FDDI_PADDING, 6), sizeof dst); + tvb_memcpy(tvb, dst, FDDI_P_DHOST + FDDI_PADDING, sizeof(dst)); swap_mac_addr(dst_swapped, tvb_get_ptr(tvb, FDDI_P_DHOST + FDDI_PADDING, 6)); /* XXX - copy them to some buffer associated with "pi", rather than @@ -345,7 +345,7 @@ dissect_fddi(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree, if (bitswapped) swap_mac_addr(src, tvb_get_ptr(tvb, FDDI_P_SHOST + FDDI_PADDING, 6)); else - memcpy(src, tvb_get_ptr(tvb, FDDI_P_SHOST + FDDI_PADDING, 6), sizeof src); + tvb_memcpy(tvb, src, FDDI_P_SHOST + FDDI_PADDING, sizeof(src)); swap_mac_addr(src_swapped, tvb_get_ptr(tvb, FDDI_P_SHOST + FDDI_PADDING, 6)); /* XXX - copy them to some buffer associated with "pi", rather than |