浏览代码

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

Rich Felker 8 年之前
父节点
当前提交
6a209f14ff
共有 1 个文件被更改,包括 5 次插入1 次删除
  1. 5 1
      src/network/res_msend.c

+ 5 - 1
src/network/res_msend.c

@@ -76,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