diff options
| author | Guy Harris <guy@alum.mit.edu> | 2015-12-31 12:51:50 -0800 |
|---|---|---|
| committer | Guy Harris <guy@alum.mit.edu> | 2015-12-31 20:52:24 +0000 |
| commit | 1ea011b8917c2c0111b907acf0be3ba08d9fd993 (patch) | |
| tree | 8d0bce6ba4ddea39cc49106aece077f528301698 /epan/dissectors/packet-aeron.c | |
| parent | 2bc6530a99d73ce9ee576f61d9faf48daf7d99cf (diff) | |
Use wmem_memdup() instead of wmem_alloc() followed by memcpy().
Change-Id: Ia937fe15a371a3109178ba619dbdb3a6db3897ee
Reviewed-on: https://code.wireshark.org/review/12962
Reviewed-by: Guy Harris <guy@alum.mit.edu>
Diffstat (limited to 'epan/dissectors/packet-aeron.c')
| -rw-r--r-- | epan/dissectors/packet-aeron.c | 12 |
1 files changed, 4 insertions, 8 deletions
diff --git a/epan/dissectors/packet-aeron.c b/epan/dissectors/packet-aeron.c index 735c805fe1..e508c26ea6 100644 --- a/epan/dissectors/packet-aeron.c +++ b/epan/dissectors/packet-aeron.c @@ -881,10 +881,8 @@ static aeron_conversation_info_t * aeron_setup_conversation_info(const packet_in guint8 * addr1; guint8 * addr2; - addr1 = (guint8 *) wmem_alloc(wmem_packet_scope(), (size_t) addr_len); - addr2 = (guint8 *) wmem_alloc(wmem_packet_scope(), (size_t) addr_len); - memcpy((void *) addr1, (void *) dst_addr, (size_t) addr_len); - memcpy((void *) addr2, (void *) dst_addr, (size_t) addr_len); + addr1 = (guint8 *) wmem_memdup(wmem_packet_scope(), (const void *) dst_addr, (size_t) addr_len); + addr2 = (guint8 *) wmem_memdup(wmem_packet_scope(), (const void *) dst_addr, (size_t) addr_len); if ((dst_addr[addr_len - 1] & 0x1) != 0) { /* Address is odd, so it's the data group (in addr2). Increment the last byte of addr1 for the control group. */ @@ -938,10 +936,8 @@ static aeron_conversation_info_t * aeron_setup_conversation_info(const packet_in guint8 * addr1; guint8 * addr2; - addr1 = (guint8 *) wmem_alloc(wmem_packet_scope(), (size_t) addr_len); - addr2 = (guint8 *) wmem_alloc(wmem_packet_scope(), (size_t) addr_len); - memcpy((void *) addr1, (void *) dst_addr, (size_t) addr_len); - memcpy((void *) addr2, (void *) dst_addr, (size_t) addr_len); + addr1 = (guint8 *) wmem_memdup(wmem_packet_scope(), (const void *) dst_addr, (size_t) addr_len); + addr2 = (guint8 *) wmem_memdup(wmem_packet_scope(), (const void *) dst_addr, (size_t) addr_len); if ((dst_addr[addr_len - 1] & 0x1) != 0) { /* Address is odd, so it's the data group (in addr2). Increment the last byte of addr1 for the control group. */ |