fix for previous incorrect fix of cancellation in dns lookups
authorRich Felker <dalias@aerifal.cx>
Thu, 23 Feb 2012 18:07:20 +0000 (13:07 -0500)
committerRich Felker <dalias@aerifal.cx>
Thu, 23 Feb 2012 18:07:20 +0000 (13:07 -0500)
uninitialized file descriptor was being closed on return, causing
stdin to be closed in many cases.

src/network/__dns.c

index 0d4f47e0ccdc373c466ad04fcdb969fd370e7185..786c054a80d18292d8f7178002d34909df11de35 100644 (file)
@@ -89,12 +89,13 @@ int __dns_doqueries(unsigned char *dest, const char *name, int *rr, int rrcnt)
                sl = sizeof sa.sin;
        }
 
-       pthread_cleanup_push(cleanup, (void *)(intptr_t)fd);
-       pthread_setcancelstate(cs, 0);
-
        /* Get local address and open/bind a socket */
        sa.sin.sin_family = family;
        fd = socket(family, SOCK_DGRAM, 0);
+
+       pthread_cleanup_push(cleanup, (void *)(intptr_t)fd);
+       pthread_setcancelstate(cs, 0);
+
        if (bind(fd, (void *)&sa, sl) < 0) {
                errcode = EAI_SYSTEM;
                goto out;