Alex Henrie : ws2_32: Don't set output length in WSAStringToAddress on error.

[Alexandre Julliard]

Module: wine
Branch: master
Commit: c84e416d2308c6aa8266d78457f16a11f9324e18
URL:    https://source.winehq.org/git/wine.git/?a=commit;h=c84e416d2308c6aa8266d7845...

Author: Alex Henrie <alexhenrie24(a)gmail.com>
Date:   Wed May 20 08:11:18 2020 -0600

ws2_32: Don't set output length in WSAStringToAddress on error.

Signed-off-by: Alex Henrie <alexhenrie24(a)gmail.com>
Signed-off-by: Alexandre Julliard <julliard(a)winehq.org>

---

 dlls/ws2_32/socket.c     |  4 ++--
 dlls/ws2_32/tests/sock.c | 20 +++++++++++++++-----
 2 files changed, 17 insertions(+), 7 deletions(-)

diff --git a/dlls/ws2_32/socket.c b/dlls/ws2_32/socket.c
index 8e66ab8fec..bdfe63ee19 100644
--- a/dlls/ws2_32/socket.c
+++ b/dlls/ws2_32/socket.c
@@ -8514,7 +8514,6 @@ INT WINAPI WSAStringToAddressA(LPSTR AddressString,
             res = WSAEFAULT;
             break;
         }
-        *lpAddressLength = sizeof(SOCKADDR_IN);
         memset(lpAddress, 0, sizeof(SOCKADDR_IN));
 
         status = RtlIpv4StringToAddressExA(AddressString, FALSE, &addr4->sin_addr, &addr4->sin_port);
@@ -8524,6 +8523,7 @@ INT WINAPI WSAStringToAddressA(LPSTR AddressString,
             break;
         }
         addr4->sin_family = WS_AF_INET;
+        *lpAddressLength = sizeof(SOCKADDR_IN);
         break;
     }
     case WS_AF_INET6:
@@ -8537,7 +8537,6 @@ INT WINAPI WSAStringToAddressA(LPSTR AddressString,
             res = WSAEFAULT;
             break;
         }
-        *lpAddressLength = sizeof(SOCKADDR_IN6);
         memset(lpAddress, 0, sizeof(SOCKADDR_IN6));
 
         status = RtlIpv6StringToAddressExA(AddressString, &addr6->sin6_addr, &addr6->sin6_scope_id, &addr6->sin6_port);
@@ -8547,6 +8546,7 @@ INT WINAPI WSAStringToAddressA(LPSTR AddressString,
             break;
         }
         addr6->sin6_family = WS_AF_INET6;
+        *lpAddressLength = sizeof(SOCKADDR_IN6);
         break;
     }
     default:
diff --git a/dlls/ws2_32/tests/sock.c b/dlls/ws2_32/tests/sock.c
index a89a964129..c72dc7a77a 100644
--- a/dlls/ws2_32/tests/sock.c
+++ b/dlls/ws2_32/tests/sock.c
@@ -3454,7 +3454,7 @@ static void test_WSAStringToAddress(void)
     };
 
     WCHAR inputW[64];
-    INT len, ret, expected_ret;
+    INT len, ret, expected_len, expected_ret;
     short expected_family;
     SOCKADDR_IN sockaddr;
     SOCKADDR_IN6 sockaddr6;
@@ -3465,13 +3465,16 @@ static void test_WSAStringToAddress(void)
     ret = WSAStringToAddressA( ipv4_tests[0].input, AF_INET, NULL, (SOCKADDR*)&sockaddr, &len );
     ok( ret == SOCKET_ERROR, "WSAStringToAddressA() returned %d, expected SOCKET_ERROR\n", ret );
     ok( WSAGetLastError() == WSAEFAULT, "WSAStringToAddress() gave error %d, expected WSAEFAULT\n", WSAGetLastError() );
+    ok( len >= sizeof(sockaddr) || broken(len == 0) /* xp */,
+        "WSAStringToAddress() gave length %d, expected at least %d\n", len, sizeof(sockaddr) );
 
     for (i = 0; i < 2; i++)
     {
         for (j = 0; j < ARRAY_SIZE(ipv4_tests); j++)
         {
-            len = sizeof(sockaddr);
-            memset( &sockaddr, 0xab, len );
+            len = sizeof(sockaddr) + 10;
+            expected_len = ipv4_tests[j].error ? len : sizeof(sockaddr);
+            memset( &sockaddr, 0xab, sizeof(sockaddr) );
 
             WSASetLastError( 0 );
             if (i == 0)
@@ -3500,12 +3503,16 @@ static void test_WSAStringToAddress(void)
             ok( sockaddr.sin_port == ipv4_tests[j].port,
                 "WSAStringToAddress(%s) gave port %04x, expected %04x\n",
                 wine_dbgstr_a( ipv4_tests[j].input ), sockaddr.sin_port, ipv4_tests[j].port );
+            ok( len == expected_len,
+                "WSAStringToAddress(%s) gave length %d, expected %d\n",
+                wine_dbgstr_a( ipv4_tests[j].input ), len, expected_len );
         }
 
         for (j = 0; j < ARRAY_SIZE(ipv6_tests); j++)
         {
-            len = sizeof(sockaddr6);
-            memset( &sockaddr6, 0xab, len );
+            len = sizeof(sockaddr6) + 10;
+            expected_len = ipv6_tests[j].error ? len : sizeof(sockaddr6);
+            memset( &sockaddr6, 0xab, sizeof(sockaddr6) );
 
             WSASetLastError( 0 );
             if (i == 0)
@@ -3553,6 +3560,9 @@ static void test_WSAStringToAddress(void)
             ok( sockaddr6.sin6_flowinfo == 0,
                 "WSAStringToAddress(%s) gave flowinfo %d, expected 0\n",
                 wine_dbgstr_a( ipv6_tests[j].input ), sockaddr6.sin6_flowinfo );
+            ok( len == expected_len,
+                "WSAStringToAddress(%s) gave length %d, expected %d\n",
+                wine_dbgstr_a( ipv6_tests[j].input ), len, expected_len );
         }
     }
 }