[PATCH v7 1/2] wbemprox: Correct IP address order when calling Win32_NetworkAdapterConfiguration.

[Zhao Yi]

From: Zhao Yi <[e-mail]>

Signed-off-by: Zhao Yi <[e-mail]>
---
 dlls/wbemprox/builtin.c | 28 +++++++++++++++++++++-------
 1 file changed, 21 insertions(+), 7 deletions(-)

diff --git a/dlls/wbemprox/builtin.c b/dlls/wbemprox/builtin.c
index 70d0364dfe9..36528098ec1 100644
--- a/dlls/wbemprox/builtin.c
+++ b/dlls/wbemprox/builtin.c
@@ -3359,20 +3359,34 @@ static struct array *get_ipaddress( IP_ADAPTER_UNICAST_ADDRESS_LH *list )
     }
     for (address = list; address; address = address->Next)
     {
+        if (address->Address.lpSockaddr->sa_family != AF_INET)
+            continue;
         buflen = ARRAY_SIZE( buf );
         if (WSAAddressToStringW( address->Address.lpSockaddr, address->Address.iSockaddrLength,
-                                 NULL, buf, &buflen) || !(ptr[i++] = wcsdup( buf )))
-        {
-            for (; i > 0; i--) free( ptr[i - 1] );
-            free( ptr );
-            free( ret );
-            return NULL;
-        }
+                                 NULL, buf, &buflen ) || !(ptr[i++] = wcsdup( buf )))
+            goto error;
     }
+
+    for (address = list; address; address = address->Next)
+    {
+        if (address->Address.lpSockaddr->sa_family != AF_INET6)
+            continue;
+        buflen = ARRAY_SIZE( buf );
+        if (WSAAddressToStringW( address->Address.lpSockaddr, address->Address.iSockaddrLength,
+                                 NULL, buf, &buflen ) || !(ptr[i++] = wcsdup( buf )))
+            goto error;
+    }
+
     ret->elem_size = sizeof(*ptr);
     ret->count     = count;
     ret->ptr       = ptr;
     return ret;
+
+error:
+    for (; i > 0; i--) free( ptr[i - 1] );
+    free( ptr );
+    free( ret );
+    return NULL;
 }
 static struct array *get_ipsubnet( IP_ADAPTER_UNICAST_ADDRESS_LH *list )
 {
-- 
GitLab


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