Commit 9b626f51 authored by Alex Henrie's avatar Alex Henrie Committed by Alexandre Julliard

iphlpapi: Cast caddr_t to char* before doing pointer arithmetic.

parent 8b864ae9
...@@ -1013,13 +1013,13 @@ static DWORD enumIPAddresses(PDWORD pcAddresses, struct ifconf *ifc) ...@@ -1013,13 +1013,13 @@ static DWORD enumIPAddresses(PDWORD pcAddresses, struct ifconf *ifc)
if (ioctlRet == 0) { if (ioctlRet == 0) {
ifPtr = ifc->ifc_buf; ifPtr = ifc->ifc_buf;
while (ifPtr && ifPtr < ifc->ifc_buf + ifc->ifc_len) { while (ifPtr && (char *)ifPtr < ifc->ifc_buf + ifc->ifc_len) {
struct ifreq *ifr = (struct ifreq *)ifPtr; struct ifreq *ifr = (struct ifreq *)ifPtr;
if (ifr->ifr_addr.sa_family == AF_INET) if (ifr->ifr_addr.sa_family == AF_INET)
numAddresses++; numAddresses++;
ifPtr += ifreq_len((struct ifreq *)ifPtr); ifPtr = (char *)ifPtr + ifreq_len((struct ifreq *)ifPtr);
} }
} }
else else
...@@ -1074,10 +1074,10 @@ DWORD getIPAddrTable(PMIB_IPADDRTABLE *ppIpAddrTable, HANDLE heap, DWORD flags) ...@@ -1074,10 +1074,10 @@ DWORD getIPAddrTable(PMIB_IPADDRTABLE *ppIpAddrTable, HANDLE heap, DWORD flags)
ret = NO_ERROR; ret = NO_ERROR;
(*ppIpAddrTable)->dwNumEntries = numAddresses; (*ppIpAddrTable)->dwNumEntries = numAddresses;
ifPtr = ifc.ifc_buf; ifPtr = ifc.ifc_buf;
while (!ret && ifPtr && ifPtr < ifc.ifc_buf + ifc.ifc_len) { while (!ret && ifPtr && (char *)ifPtr < ifc.ifc_buf + ifc.ifc_len) {
struct ifreq *ifr = (struct ifreq *)ifPtr; struct ifreq *ifr = (struct ifreq *)ifPtr;
ifPtr += ifreq_len(ifr); ifPtr = (char *)ifPtr + ifreq_len(ifr);
if (ifr->ifr_addr.sa_family != AF_INET) if (ifr->ifr_addr.sa_family != AF_INET)
continue; continue;
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment