fix possible fd leak, unrestored cancellation state on dns socket fail

[musl] / src / network / res_msend.c

diff --git a/src/network/res_msend.c b/src/network/res_msend.c
index a47d18d..3e01800 100644 (file)
--- a/src/network/res_msend.c
+++ b/src/network/res_msend.c
@@ -52,7 +52,6 @@ int __res_msend_rc(int nqueries, const unsigned char *const *queries,
        timeout = 1000*conf->timeout;
        attempts = conf->attempts;
 
-       nns = conf->nns;
        for (nns=0; nns<conf->nns; nns++) {
                const struct address *iplit = &conf->ns[nns];
                if (iplit->family == AF_INET) {
@@ -77,7 +76,11 @@ int __res_msend_rc(int nqueries, const unsigned char *const *queries,
                fd = socket(AF_INET, SOCK_DGRAM|SOCK_CLOEXEC|SOCK_NONBLOCK, 0);
                family = AF_INET;
        }
-       if (fd < 0 || bind(fd, (void *)&sa, sl) < 0) return -1;
+       if (fd < 0 || bind(fd, (void *)&sa, sl) < 0) {
+               if (fd >= 0) close(fd);
+               pthread_setcancelstate(cs, 0);
+               return -1;
+       }
 
        /* Past this point, there are no errors. Each individual query will
         * yield either no reply (indicated by zero length) or an answer