diff options
| author | Pascal Quantin <pascal.quantin@gmail.com> | 2015-01-11 14:54:24 +0100 |
|---|---|---|
| committer | Pascal Quantin <pascal.quantin@gmail.com> | 2015-01-11 13:58:14 +0000 |
| commit | f2bedeb3fea8808d7313d7a3d840adaba84b6e79 (patch) | |
| tree | b75531685d1efbc8469ee9c827757d5a3bc7e9f3 /epan/dissectors/packet-fddi.c | |
| parent | aa9376e0b4df49bf131f044ca5df274b92688914 (diff) | |
| download | wireshark-f2bedeb3fea8808d7313d7a3d840adaba84b6e79.tar.gz | |
FDDI: fix a memory corruption introduced in gecaa1f8
Bug: 10845
Change-Id: I4d47711f397d9aaa965dff3e97478517f638a2e2
Reviewed-on: https://code.wireshark.org/review/6489
Reviewed-by: Pascal Quantin <pascal.quantin@gmail.com>
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 279aec5649..c7cbe03717 100644 --- a/epan/dissectors/packet-fddi.c +++ b/epan/dissectors/packet-fddi.c @@ -365,7 +365,7 @@ dissect_fddi(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree, if (bitswapped) swap_mac_addr(dst, tvb, FDDI_P_DHOST + FDDI_PADDING); else - tvb_memcpy(tvb, dst, FDDI_P_DHOST + FDDI_PADDING, sizeof(dst)); + tvb_memcpy(tvb, dst, FDDI_P_DHOST + FDDI_PADDING, 6); swap_mac_addr(dst_swapped, tvb, FDDI_P_DHOST + FDDI_PADDING); /* XXX - copy them to some buffer associated with "pi", rather than @@ -390,7 +390,7 @@ dissect_fddi(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree, if (bitswapped) swap_mac_addr(src, tvb, FDDI_P_SHOST + FDDI_PADDING); else - tvb_memcpy(tvb, src, FDDI_P_SHOST + FDDI_PADDING, sizeof(src)); + tvb_memcpy(tvb, src, FDDI_P_SHOST + FDDI_PADDING, 6); swap_mac_addr(src_swapped, tvb, FDDI_P_SHOST + FDDI_PADDING); /* XXX - copy them to some buffer associated with "pi", rather than |