projects
/
u
/
mdw
/
putty
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Failure to connect to a Unix-domain socket could cause a segfault. Fixed.
[u/mdw/putty]
/
unix
/
uxnet.c
diff --git
a/unix/uxnet.c
b/unix/uxnet.c
index
3cf1b5f
..
d01a44d
100644
(file)
--- a/
unix/uxnet.c
+++ b/
unix/uxnet.c
@@
-236,7
+236,7
@@
SockAddr sk_nonamelookup(const char *host)
static int sk_nextaddr(SockAddr addr)
{
#ifndef NO_IPV6
static int sk_nextaddr(SockAddr addr)
{
#ifndef NO_IPV6
- if (addr->ai->ai_next) {
+ if (addr->ai
&& addr->ai
->ai_next) {
addr->ai = addr->ai->ai_next;
addr->family = addr->ai->ai_family;
return TRUE;
addr->ai = addr->ai->ai_next;
addr->family = addr->ai->ai_family;
return TRUE;
@@
-1282,9
+1282,10
@@
SockAddr platform_get_x11_unix_address(int displaynum, char **canonicalname)
else
*canonicalname = dupstr(ret->hostname);
#ifndef NO_IPV6
else
*canonicalname = dupstr(ret->hostname);
#ifndef NO_IPV6
- ret->ais = NULL;
+ ret->ai
= ret->ai
s = NULL;
#else
ret->addresses = NULL;
#else
ret->addresses = NULL;
+ ret->curraddr = ret->naddresses = 0;
#endif
return ret;
}
#endif
return ret;
}