[PATCH] ws2_32: avoid crashes on flaky/non-present network

Marcus Meissner meissner at suse.de
Sun Nov 12 13:50:45 CST 2017


Signed-off-by: Marcus Meissner <meissner at suse.de>
---
 dlls/ws2_32/tests/sock.c | 10 ++++++----
 1 file changed, 6 insertions(+), 4 deletions(-)

diff --git a/dlls/ws2_32/tests/sock.c b/dlls/ws2_32/tests/sock.c
index 179ace4c6a..cefc62326e 100644
--- a/dlls/ws2_32/tests/sock.c
+++ b/dlls/ws2_32/tests/sock.c
@@ -7657,10 +7657,12 @@ static void test_GetAddrInfoExW(void)
     ok(overlapped.Internal == ERROR_SUCCESS, "overlapped.Internal = %lx\n", overlapped.Internal);
     ok(overlapped.Pointer == &result, "overlapped.Pointer != &result\n");
     ok(result != NULL, "result == NULL\n");
-    ok(!result->ai_blob, "ai_blob != NULL\n");
-    ok(!result->ai_bloblen, "ai_bloblen != 0\n");
-    ok(!result->ai_provider, "ai_provider = %s\n", wine_dbgstr_guid(result->ai_provider));
-    pFreeAddrInfoExW(result);
+    if (result != NULL) {
+        ok(!result->ai_blob, "ai_blob != NULL\n");
+        ok(!result->ai_bloblen, "ai_bloblen != 0\n");
+        ok(!result->ai_provider, "ai_provider = %s\n", wine_dbgstr_guid(result->ai_provider));
+        pFreeAddrInfoExW(result);
+    }
 
     result = (void*)0xdeadbeef;
     memset(&overlapped, 0xcc, sizeof(overlapped));
-- 
2.15.0




More information about the wine-devel mailing list