]> asedeno.scripts.mit.edu Git - PuTTY.git/commitdiff
Always initialise the `addresses' field of a SockAddr to NULL,
authorSimon Tatham <anakin@pobox.com>
Sat, 26 Aug 2006 08:37:42 +0000 (08:37 +0000)
committerSimon Tatham <anakin@pobox.com>
Sat, 26 Aug 2006 08:37:42 +0000 (08:37 +0000)
because it gets unconditionally sfree()d in sk_addr_free(). This
just bit me when running under the MSVC debugger; not sure how it
hasn't bitten anyone until now!

[originally from svn r6800]

windows/winnet.c

index 715c492f9a0d8411fd9276fb2ae76f9357ea4de1..47ac8b25929374c6504b585f200b6df66a590016 100644 (file)
@@ -356,6 +356,7 @@ SockAddr sk_namelookup(const char *host, char **canonicalname,
 #ifndef NO_IPV6
     ret->ai = ret->ais = NULL;
 #endif
+    ret->addresses = NULL;
     ret_family = AF_UNSPEC;
     *realhost = '\0';
 
@@ -456,6 +457,7 @@ SockAddr sk_nonamelookup(const char *host)
 #ifndef NO_IPV6
     ret->ai = ret->ais = NULL;
 #endif
+    ret->addresses = NULL;
     ret->naddresses = 0;
     strncpy(ret->hostname, host, lenof(ret->hostname));
     ret->hostname[lenof(ret->hostname)-1] = '\0';