mirror of
git://source.winehq.org/git/wine.git
synced 2024-09-06 03:30:58 +00:00
server: Pass the correct size to sockaddr_from_unix() (Valgrind).
Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=50437 Signed-off-by: Zebediah Figura <z.figura12@gmail.com> Signed-off-by: Alexandre Julliard <julliard@winehq.org>
This commit is contained in:
parent
798137dbf6
commit
ebe20da774
|
@ -459,6 +459,7 @@ static void fill_accept_output( struct accept_req *req, struct iosb *iosb )
|
|||
{
|
||||
union unix_sockaddr unix_addr;
|
||||
struct WS_sockaddr *win_addr;
|
||||
unsigned int remote_len;
|
||||
socklen_t unix_len;
|
||||
int fd, size = 0;
|
||||
char *out_data;
|
||||
|
@ -495,7 +496,7 @@ static void fill_accept_output( struct accept_req *req, struct iosb *iosb )
|
|||
unix_len = sizeof(unix_addr);
|
||||
win_addr = (struct WS_sockaddr *)(out_data + req->recv_len + sizeof(int));
|
||||
if (getsockname( fd, &unix_addr.addr, &unix_len ) < 0 ||
|
||||
(win_len = sockaddr_from_unix( &unix_addr, win_addr, req->local_len )) < 0)
|
||||
(win_len = sockaddr_from_unix( &unix_addr, win_addr, req->local_len - sizeof(int) )) < 0)
|
||||
{
|
||||
set_win32_error( sock_get_error( errno ) );
|
||||
free( out_data );
|
||||
|
@ -506,8 +507,9 @@ static void fill_accept_output( struct accept_req *req, struct iosb *iosb )
|
|||
|
||||
unix_len = sizeof(unix_addr);
|
||||
win_addr = (struct WS_sockaddr *)(out_data + req->recv_len + req->local_len + sizeof(int));
|
||||
remote_len = iosb->out_size - req->recv_len - req->local_len;
|
||||
if (getpeername( fd, &unix_addr.addr, &unix_len ) < 0 ||
|
||||
(win_len = sockaddr_from_unix( &unix_addr, win_addr, iosb->out_size - req->recv_len - req->local_len )) < 0)
|
||||
(win_len = sockaddr_from_unix( &unix_addr, win_addr, remote_len - sizeof(int) )) < 0)
|
||||
{
|
||||
set_win32_error( sock_get_error( errno ) );
|
||||
free( out_data );
|
||||
|
|
Loading…
Reference in a new issue