wbrawner/openssl
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Make fallback addresses static so that we can initialize it

Browse source 
Reviewed-by: Richard Levitte <levitte@openssl.org>

MR: #1841
This commit is contained in:
Kurt Roeckx 2016-02-04 01:59:20 +01:00
parent 47c1a0e06e
commit 37e3daf4a1
1 changed files with 11 additions and 8 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

19
crypto/bio/b_addr.c
View file

@ -672,18 +672,20 @@ int BIO_lookup(const char *host, const char *service,
}
} else {
#endif
struct hostent *he;
const struct hostent *he;
/* Windows doesn't seem to have in_addr_t */
#ifdef OPENSSL_SYS_WINDOWS
uint32_t he_fallback_address = INADDR_ANY;
uint32_t *he_fallback_addresses[] = { &he_fallback_address, NULL };
static uint32_t he_fallback_address;
static const uint32_t *he_fallback_addresses[] =
{ &he_fallback_address, NULL };
#else
in_addr_t he_fallback_address = INADDR_ANY;
in_addr_t *he_fallback_addresses[] = { &he_fallback_address, NULL };
static in_addr_t he_fallback_address;
static const in_addr_t *he_fallback_addresses[] =
{ &he_fallback_address, NULL };
#endif
struct hostent he_fallback = { NULL, NULL, AF_INET,
sizeof(he_fallback_address),
(char **)&he_fallback_addresses };
static const struct hostent he_fallback =
{ NULL, NULL, AF_INET, sizeof(he_fallback_address),
(char **)&he_fallback_addresses };
struct servent *se;
/* Apprently, on WIN64, s_proto and s_port have traded places... */
#ifdef _WIN64
@ -695,6 +697,7 @@ int BIO_lookup(const char *host, const char *service,
CRYPTO_w_lock(CRYPTO_LOCK_GETHOSTBYNAME);
CRYPTO_w_lock(CRYPTO_LOCK_GETSERVBYNAME);
he_fallback_address = INADDR_ANY;
if (host == NULL) {
he = &he_fallback;
switch(lookup_type) {