Protect access to s.serverClient

osquery · Nov 7, 2023 · 9e0a6fd · 9e0a6fd
1 parent 458478a
commit 9e0a6fd
Showing 1 changed file with 6 additions and 2 deletions.
diff --git a/server.go b/server.go
@@ -255,12 +255,16 @@ func (s *ExtensionManagerServer) Run() error {
 		for {
 			time.Sleep(s.pingInterval)
 
+			s.mutex.Lock()
+			serverClient := s.serverClient
+			s.mutex.Unlock()
+
 			// can't ping if s.Shutdown has already happened
-			if s.serverClient == nil {
+			if serverClient == nil {
 				break
 			}
 
-			status, err := s.serverClient.Ping()
+			status, err := serverClient.Ping()
 			if err != nil {
 				errc <- errors.Wrap(err, "extension ping failed")
 				break