mirror of
https://git.tartarus.org/simon/putty.git
synced 2025-02-04 14:12:24 +00:00
Failure to connect to a Unix-domain socket could cause a segfault. Fixed.
[originally from svn r6550]
This commit is contained in:
parent
54d78e2fe4
commit
2e06985445
@ -236,7 +236,7 @@ SockAddr sk_nonamelookup(const char *host)
|
|||||||
static int sk_nextaddr(SockAddr addr)
|
static int sk_nextaddr(SockAddr addr)
|
||||||
{
|
{
|
||||||
#ifndef NO_IPV6
|
#ifndef NO_IPV6
|
||||||
if (addr->ai->ai_next) {
|
if (addr->ai && addr->ai->ai_next) {
|
||||||
addr->ai = addr->ai->ai_next;
|
addr->ai = addr->ai->ai_next;
|
||||||
addr->family = addr->ai->ai_family;
|
addr->family = addr->ai->ai_family;
|
||||||
return TRUE;
|
return TRUE;
|
||||||
@ -1282,9 +1282,10 @@ SockAddr platform_get_x11_unix_address(int displaynum, char **canonicalname)
|
|||||||
else
|
else
|
||||||
*canonicalname = dupstr(ret->hostname);
|
*canonicalname = dupstr(ret->hostname);
|
||||||
#ifndef NO_IPV6
|
#ifndef NO_IPV6
|
||||||
ret->ais = NULL;
|
ret->ai = ret->ais = NULL;
|
||||||
#else
|
#else
|
||||||
ret->addresses = NULL;
|
ret->addresses = NULL;
|
||||||
|
ret->curraddr = ret->naddresses = 0;
|
||||||
#endif
|
#endif
|
||||||
return ret;
|
return ret;
|
||||||
}
|
}
|
||||||
|
Loading…
Reference in New Issue
Block a user