From 56ddcc720837522e0ff0199422284a7e69e5e891 Mon Sep 17 00:00:00 2001 From: Rich Felker Date: Thu, 23 Feb 2012 13:07:20 -0500 Subject: fix for previous incorrect fix of cancellation in dns lookups uninitialized file descriptor was being closed on return, causing stdin to be closed in many cases. --- src/network/__dns.c | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) (limited to 'src/network') diff --git a/src/network/__dns.c b/src/network/__dns.c index 0d4f47e0..786c054a 100644 --- a/src/network/__dns.c +++ b/src/network/__dns.c @@ -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; -- cgit v1.2.1