nihilist/tor
1
0
Fork 0
mirror of https://gitlab.torproject.org/tpo/core/tor.git synced 2024-11-28 14:23:30 +01:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'maint-0.3.3' into maint-0.3.4

Browse Source
This commit is contained in:
Nick Mathewson 2018-09-07 08:42:19 -04:00
commit b6de39e5f4
2 changed files with 9 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
changes/bug27465 Normal file
View File

@ -0,0 +1,5 @@
o Minor bugfixes (compilation):
- Silence a spurious compiler warning on the GetAdaptersAddresses
function pointer cast. This issue is already fixed by 26481 in
0.3.5 and later, by removing the lookup and cast.
Fixes bug 27465; bugfix on 0.2.3.11-alpha.

5
src/common/address.c
View File

@ -1496,7 +1496,10 @@ get_interface_addresses_win32(int severity, sa_family_t family)
goto done; goto done;
} }
if (!(fn = (GetAdaptersAddresses_fn_t) /* Cast through a void function pointer, to silence a spurious compiler
* warning on 64-bit Windows. This cast is safe, because we are casting to
* the correct type for GetAdaptersAddresses(). */
if (!(fn = (GetAdaptersAddresses_fn_t)(void(*)(void))
GetProcAddress(lib, "GetAdaptersAddresses"))) { GetProcAddress(lib, "GetAdaptersAddresses"))) {
log_fn(severity, LD_NET, "Unable to obtain pointer to " log_fn(severity, LD_NET, "Unable to obtain pointer to "
"GetAdaptersAddresses"); "GetAdaptersAddresses");