From 7264bea8c96f3a60343b1efb2304da3b067c50c7 Mon Sep 17 00:00:00 2001
From: Kovid Goyal <kovid@kovidgoyal.net>
Date: Fri, 7 Oct 2022 14:03:09 +0530
Subject: [PATCH] Fix selector incorrectly marking fd as ready on EINTR

---
 tools/utils/select.go | 16 ++++++++--------
 1 file changed, 8 insertions(+), 8 deletions(-)

diff --git a/tools/utils/select.go b/tools/utils/select.go
index 1f3822f40..8c52f217d 100644
--- a/tools/utils/select.go
+++ b/tools/utils/select.go
@@ -54,14 +54,11 @@ func (self *Selector) UnRegisterError(fd int) {
 }
 
 func (self *Selector) Wait(timeout time.Duration) (num_ready int, err error) {
-	self.read_set.Zero()
-	self.write_set.Zero()
-	self.err_set.Zero()
 	max_fd_num := 0
 
-	init_set := func(s *unix.FdSet, m *map[int]bool) {
+	init_set := func(s *unix.FdSet, m map[int]bool) {
 		s.Zero()
-		for fd, enabled := range *m {
+		for fd, enabled := range m {
 			if fd > -1 && enabled {
 				if max_fd_num < fd {
 					max_fd_num = fd
@@ -70,11 +67,14 @@ func (self *Selector) Wait(timeout time.Duration) (num_ready int, err error) {
 			}
 		}
 	}
-	init_set(&self.read_set, &self.read_fds)
-	init_set(&self.write_set, &self.write_fds)
-	init_set(&self.err_set, &self.err_fds)
+	init_set(&self.read_set, self.read_fds)
+	init_set(&self.write_set, self.write_fds)
+	init_set(&self.err_set, self.err_fds)
 	num_ready, err = Select(max_fd_num+1, &self.read_set, &self.write_set, &self.err_set, timeout)
 	if err == unix.EINTR {
+		self.read_set.Zero()
+		self.write_set.Zero()
+		self.err_set.Zero()
 		return 0, nil
 	}
 	return