fix illegal goto out of cleanup context in dns lookups
authorRich Felker <dalias@aerifal.cx>
Sat, 11 Feb 2012 05:05:58 +0000 (00:05 -0500)
committerRich Felker <dalias@aerifal.cx>
Sat, 11 Feb 2012 05:05:58 +0000 (00:05 -0500)
src/network/__dns.c

index 8cd7d5d..45d9b43 100644 (file)
@@ -88,6 +88,9 @@ int __dns_doqueries(unsigned char *dest, const char *name, int *rr, int rrcnt)
                sl = sizeof sa.sin;
        }
 
                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);
        /* Get local address and open/bind a socket */
        sa.sin.sin_family = family;
        fd = socket(family, SOCK_DGRAM, 0);
@@ -101,9 +104,6 @@ int __dns_doqueries(unsigned char *dest, const char *name, int *rr, int rrcnt)
        pfd.fd = fd;
        pfd.events = POLLIN;
 
        pfd.fd = fd;
        pfd.events = POLLIN;
 
-       pthread_cleanup_push(cleanup, (void *)(intptr_t)fd);
-       pthread_setcancelstate(cs, 0);
-
        /* Loop until we timeout; break early on success */
        for (; time(0)-t0 < TIMEOUT; ) {
 
        /* Loop until we timeout; break early on success */
        for (; time(0)-t0 < TIMEOUT; ) {