drew
/
acadia-newlib
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

* net.cc (call_gaa): Fix setting pa_ret pointer in case of an error 

from GetAdaptersAddresses (CID 60218).
	(get_ifs): Add missing braces in AF_INET6 case which broke netmask
	computation.  Break out of loop if prefix gets <= 0 (CID 59939).
This commit is contained in:
Corinna Vinschen 2014-05-19 15:57:22 +00:00
parent a25a812338
commit e0f53cfe6a
2 changed files with 15 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
winsup/cygwin/ChangeLog
View File

@ -1,3 +1,10 @@
2014-05-19 Corinna Vinschen <corinna@vinschen.de>
* net.cc (call_gaa): Fix setting pa_ret pointer in case of an error
from GetAdaptersAddresses (CID 60218).
(get_ifs): Add missing braces in AF_INET6 case which broke netmask
computation. Break out of loop if prefix gets <= 0 (CID 59939).
2014-05-19 Corinna Vinschen <corinna@vinschen.de> 2014-05-19 Corinna Vinschen <corinna@vinschen.de>
* include/cygwin/version.h (CYGWIN_VERSION_DLL_MINOR): Bump to 31. * include/cygwin/version.h (CYGWIN_VERSION_DLL_MINOR): Bump to 31.

8
winsup/cygwin/net.cc
View File

@ -1673,7 +1673,7 @@ call_gaa (LPVOID param)
if (ret != ERROR_SUCCESS) if (ret != ERROR_SUCCESS)
{ {
free (pa0); free (pa0);
*p->pa_ret = pa0; *p->pa_ret = NULL;
} }
else else
*p->pa_ret = pa0; *p->pa_ret = pa0;
@ -1685,7 +1685,7 @@ bool
get_adapters_addresses (PIP_ADAPTER_ADDRESSES *pa_ret, ULONG family) get_adapters_addresses (PIP_ADAPTER_ADDRESSES *pa_ret, ULONG family)
{ {
DWORD ret; DWORD ret;
gaa_wa param = { family, pa_ret ?: NULL }; gaa_wa param = { family, pa_ret };
if ((uintptr_t) &param >= (uintptr_t) 0x80000000L if ((uintptr_t) &param >= (uintptr_t) 0x80000000L
&& wincap.has_gaa_largeaddress_bug ()) && wincap.has_gaa_largeaddress_bug ())
@ -2080,10 +2080,12 @@ get_ifs (ULONG family)
break; break;
case AF_INET6: case AF_INET6:
if_sin6 = (struct sockaddr_in6 *) &ifp->ifa_netmask; if_sin6 = (struct sockaddr_in6 *) &ifp->ifa_netmask;
for (cnt = 0; cnt < 4 && prefix; ++cnt, prefix -= 32) for (cnt = 0; cnt < 4 && prefix > 0; ++cnt, prefix -= 32)
{
if_sin6->sin6_addr.s6_addr32[cnt] = UINT32_MAX; if_sin6->sin6_addr.s6_addr32[cnt] = UINT32_MAX;
if (prefix < 32) if (prefix < 32)
if_sin6->sin6_addr.s6_addr32[cnt] <<= 32 - prefix; if_sin6->sin6_addr.s6_addr32[cnt] <<= 32 - prefix;
}
break; break;
} }
ifp->ifa_ifa.ifa_netmask = (struct sockaddr *) &ifp->ifa_netmask; ifp->ifa_ifa.ifa_netmask = (struct sockaddr *) &ifp->ifa_netmask;