Wine-Commits

wine-commits@list.winehq.org

January 2021

2 participants
472 discussions

Alexandre Julliard : Update copyright info for 2021.
by Alexandre Julliard Jan. 2, 2021

Jan. 2, 2021

Module: wine Branch: master Commit: 88d7aeee342b097a68a0532d00ebff3187430f17 URL: https://source.winehq.org/git/wine.git/?a=commit;h=88d7aeee342b097a68a0532d… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Sat Jan 2 14:37:47 2021 +0100 Update copyright info for 2021. Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- LICENSE | 2 +- dlls/opengl32/version.rc | 2 +- include/wine/wine_common_ver.rc | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/LICENSE b/LICENSE index 34528113709..1a12a1e3a92 100644 --- a/LICENSE +++ b/LICENSE @@ -1,4 +1,4 @@ -Copyright (c) 1993-2020 the Wine project authors (see the file AUTHORS +Copyright (c) 1993-2021 the Wine project authors (see the file AUTHORS for a complete list) Wine is free software; you can redistribute it and/or modify it under diff --git a/dlls/opengl32/version.rc b/dlls/opengl32/version.rc index 12c377bc9f6..f17f3ce0d74 100644 --- a/dlls/opengl32/version.rc +++ b/dlls/opengl32/version.rc @@ -20,7 +20,7 @@ #define WINE_FILENAME_STR "opengl32.dll" #define WINE_FILEVERSION 5,1,2600,2082 #define WINE_FILEVERSION_STR "5.1.2600.2082" -#define WINE_LEGALCOPYRIGHT "Copyright (c) 1993-2020 the Wine project. Not Microsoft" /* CATIA needs 'Microsoft' in both CompanyName _and_ LegalCopyright */ +#define WINE_LEGALCOPYRIGHT "Copyright (c) 1993-2021 the Wine project. Not Microsoft" /* CATIA needs 'Microsoft' in both CompanyName _and_ LegalCopyright */ #define WINE_PRODUCTVERSION 5,1,2600,2082 #define WINE_PRODUCTVERSION_STR "5.1" diff --git a/include/wine/wine_common_ver.rc b/include/wine/wine_common_ver.rc index 35ea44773a2..989192dc6fc 100644 --- a/include/wine/wine_common_ver.rc +++ b/include/wine/wine_common_ver.rc @@ -76,7 +76,7 @@ never complain. #endif #ifndef WINE_LEGALCOPYRIGHT -#define WINE_LEGALCOPYRIGHT "Copyright (c) 1993-2020 the Wine project authors (see the file AUTHORS for a complete list)" +#define WINE_LEGALCOPYRIGHT "Copyright (c) 1993-2021 the Wine project authors (see the file AUTHORS for a complete list)" #endif #ifndef WINE_PRODUCTVERSION

1 0

Zebediah Figura : server: Pass the correct size to sockaddr_from_unix() (Valgrind).
by Alexandre Julliard Jan. 2, 2021

Jan. 2, 2021

Module: wine Branch: master Commit: ebe20da774cf62f3241d45db135175369ed475ad URL: https://source.winehq.org/git/wine.git/?a=commit;h=ebe20da774cf62f3241d45db… Author: Zebediah Figura <z.figura12(a)gmail.com> Date: Fri Jan 1 12:01:36 2021 -0600 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(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- server/sock.c | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/server/sock.c b/server/sock.c index 1ff56f7bbe5..5f207e7f180 100644 --- a/server/sock.c +++ b/server/sock.c @@ -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 );

1 0

Jump to page: