iphlpapi: Use a separate index to count addresses in GetAdaptersAddresses.

Fixes address enumeration when an interfaces is not configured with an IP address or when an interface is configured with more than one address.

iphlpapi: Use a separate index to count addresses in GetAdaptersAddresses.
cd1ed081 · Hans Leidekker · Alexandre Julliard · c23ccc03 · cd1ed081
Commit cd1ed081 authored Jul 07, 2009 by Hans Leidekker Committed by Alexandre Julliard Jul 07, 2009
Hide whitespace changes
Inline Side-by-side

Showing with 3 additions and 3 deletions

iphlpapi_main.c dlls/iphlpapi/iphlpapi_main.c +3 -3

No files found.
--- a/dlls/iphlpapi/iphlpapi_main.c
+++ b/dlls/iphlpapi/iphlpapi_main.c
@@ -611,7 +611,7 @@ static DWORD typeFromMibType(DWORD mib_type)

 static ULONG addressesFromIndex(DWORD index, DWORD **addrs, ULONG *num_addrs)
 {
-    ULONG ret, i;
+    ULONG ret, i, j;
    MIB_IPADDRTABLE *at;

    *num_addrs = 0;
@@ -625,9 +625,9 @@ static ULONG addressesFromIndex(DWORD index, DWORD **addrs, ULONG *num_addrs)
        HeapFree(GetProcessHeap(), 0, at);
        return ERROR_OUTOFMEMORY;
    }
-    for (i = 0; i < at->dwNumEntries; i++)
+    for (i = 0, j = 0; i < at->dwNumEntries; i++)
    {
-        if (at->table[i].dwIndex == index) (*addrs)[i] = at->table[i].dwAddr;
+        if (at->table[i].dwIndex == index) (*addrs)[j++] = at->table[i].dwAddr;
    }
    HeapFree(GetProcessHeap(), 0, at);
    return ERROR_SUCCESS;