[PATCH 3/3] server: Don't reset socket error in IOCTL_AFD_GET_SO_ERROR.

Piotr Caban wine at gitlab.winehq.org
Fri Jun 10 11:01:03 CDT 2022


From: Piotr Caban <piotr at codeweavers.com>

Signed-off-by: Piotr Caban <piotr at codeweavers.com>
---
 server/sock.c | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

diff --git a/server/sock.c b/server/sock.c
index c4bbd388097..466899af064 100644
--- a/server/sock.c
+++ b/server/sock.c
@@ -2798,7 +2798,6 @@ static void sock_ioctl( struct fd *fd, ioctl_code_t code, struct async *async )
     case IOCTL_AFD_WINE_GET_SO_ERROR:
     {
         int error;
-        socklen_t len = sizeof(error);
         unsigned int i;
 
         if (get_reply_max_size() < sizeof(error))
@@ -2807,7 +2806,7 @@ static void sock_ioctl( struct fd *fd, ioctl_code_t code, struct async *async )
             return;
         }
 
-        if (getsockopt( unix_fd, SOL_SOCKET, SO_ERROR, (char *)&error, &len ) < 0)
+        if (sock_error( sock, &error ) < 0)
         {
             set_error( sock_get_ntstatus( errno ) );
             return;
-- 
GitLab

https://gitlab.winehq.org/wine/wine/-/merge_requests/225



More information about the wine-devel mailing list