wininet(4/10): Use length reported by GetAddress in FTP_Connect

Juan Lang juan.lang at gmail.com
Thu Jul 9 13:58:06 CDT 2009


--Juan
-------------- next part --------------
From d2a03d8f0e4a4c41144135acda3151c7ab22abfa Mon Sep 17 00:00:00 2001
From: Juan Lang <juan.lang at gmail.com>
Date: Thu, 9 Jul 2009 11:01:44 -0700
Subject: [PATCH 08/14] Use length reported by GetAddress in FTP_Connect

---
 dlls/wininet/ftp.c |    6 +++---
 1 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/dlls/wininet/ftp.c b/dlls/wininet/ftp.c
index 791459e..75bf69c 100644
--- a/dlls/wininet/ftp.c
+++ b/dlls/wininet/ftp.c
@@ -2458,9 +2458,9 @@ HINTERNET FTP_Connect(LPWININETAPPINFOW hIC, LPCWSTR lpszServerName,
     }
 
     SendAsyncCallback(&hIC->hdr, dwContext, INTERNET_STATUS_CONNECTING_TO_SERVER,
-        &socketAddr, sizeof(struct sockaddr_in));
+        &socketAddr, sock_namelen);
 
-    if (connect(nsocket, (struct sockaddr *)&socketAddr, sizeof(socketAddr)) < 0)
+    if (connect(nsocket, (struct sockaddr *)&socketAddr, sock_namelen) < 0)
     {
 	ERR("Unable to connect (%s)\n", strerror(errno));
 	INTERNET_SetLastError(ERROR_INTERNET_CANNOT_CONNECT);
@@ -2471,7 +2471,7 @@ HINTERNET FTP_Connect(LPWININETAPPINFOW hIC, LPCWSTR lpszServerName,
         TRACE("Connected to server\n");
 	lpwfs->sndSocket = nsocket;
         SendAsyncCallback(&hIC->hdr, dwContext, INTERNET_STATUS_CONNECTED_TO_SERVER,
-            &socketAddr, sizeof(struct sockaddr_in));
+            &socketAddr, sock_namelen);
 
 	sock_namelen = sizeof(lpwfs->socketAddress);
 	getsockname(nsocket, (struct sockaddr *) &lpwfs->socketAddress, &sock_namelen);
-- 
1.6.3.2


More information about the wine-patches mailing list