summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorRich Felker <dalias@aerifal.cx>2012-02-11 00:05:58 -0500
committerRich Felker <dalias@aerifal.cx>2012-02-11 00:05:58 -0500
commitf42bad9ccb2af7cde8a676d57c4d161455256456 (patch)
tree79bd83f0654b76d6ab96e60aa9139d017a07b1aa
parent2230218c283af7fbff08167685f17dad8d748f14 (diff)
downloadmusl-f42bad9ccb2af7cde8a676d57c4d161455256456.tar.gz
fix illegal goto out of cleanup context in dns lookups
-rw-r--r--src/network/__dns.c6
1 files changed, 3 insertions, 3 deletions
diff --git a/src/network/__dns.c b/src/network/__dns.c
index 8cd7d5d0..45d9b438 100644
--- a/src/network/__dns.c
+++ b/src/network/__dns.c
@@ -88,6 +88,9 @@ 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);
@@ -101,9 +104,6 @@ int __dns_doqueries(unsigned char *dest, const char *name, int *rr, int rrcnt)
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; ) {