Skip to content

Commit

Permalink
linux-user/syscall: Replace g_malloc0 + memcpy with g_memdup
Browse files Browse the repository at this point in the history
No need to use g_malloc0 to zero the memory if we memcpy to
the whole buffer afterwards anyway. Actually, there is even
a function which combines both steps, g_memdup, so let's use
this function here instead.

Signed-off-by: Thomas Huth <thuth@redhat.com>
Reviewed-by: Eric Blake <eblake@redhat.com>
Signed-off-by: Michael Tokarev <mjt@tls.msk.ru>
  • Loading branch information
huth authored and Michael Tokarev committed Nov 6, 2015
1 parent 1123178 commit e9d49d5
Showing 1 changed file with 1 addition and 2 deletions.
3 changes: 1 addition & 2 deletions linux-user/syscall.c
Expand Up @@ -5325,8 +5325,7 @@ static abi_long do_open_by_handle_at(abi_long mount_fd, abi_long handle,
return -TARGET_EFAULT;
}

fh = g_malloc0(total_size);
memcpy(fh, target_fh, total_size);
fh = g_memdup(target_fh, total_size);
fh->handle_bytes = size;
fh->handle_type = tswap32(target_fh->handle_type);

Expand Down

0 comments on commit e9d49d5

Please sign in to comment.