osmocom
/
wireshark
11
0
Fork 1
Code Issues Pull Requests Projects Releases Wiki Activity

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>
This commit is contained in:
Guy Harris 2015-12-31 12:51:50 -08:00
parent 2bc6530a99
commit 1ea011b891
1 changed files with 4 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
epan/dissectors/packet-aeron.c
View File

@ -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. */