X-Git-Url: https://git.distorted.org.uk/~mdw/sgt/putty/blobdiff_plain/b7a189f38294c745ae4ea6efb55891c8196e275b..492a04dbc27f0ccb0d8d4fcc8da529df0cd254c9:/winnet.c?ds=sidebyside diff --git a/winnet.c b/winnet.c index e94075b5..4bebe6d7 100644 --- a/winnet.c +++ b/winnet.c @@ -365,6 +365,7 @@ SockAddr sk_namelookup(char *host, char **canonicalname) SockAddr sk_nonamelookup(char *host) { SockAddr ret = smalloc(sizeof(struct SockAddr_tag)); + ret->error = NULL; ret->family = AF_UNSPEC; strncpy(ret->hostname, host, lenof(ret->hostname)); ret->hostname[lenof(ret->hostname)-1] = '\0'; @@ -972,23 +973,8 @@ int select_result(WPARAM wParam, LPARAM lParam) /* wParam is the socket itself */ - /* - * One user has reported an assertion failure in tree234 which - * indicates a null element pointer has been passed to a - * find*234 function. The following find234 is the only one in - * the whole program that I can see being capable of doing - * this, hence I'm forced to conclude that WinSock is capable - * of sending me netevent messages with wParam==0. I want to - * know what the rest of the message is if it does so! - */ - if (wParam == 0) { - char *str; - str = dupprintf("Strange WinSock message: wp=%08x lp=%08x", - (int)wParam, (int)lParam); - logevent(NULL, str); - connection_fatal(NULL, str); - sfree(str); - } + if (wParam == 0) + return 1; /* boggle */ s = find234(sktree, (void *) wParam, cmpforsearch); if (!s)