Fix nil pointer derefence on failure to connect to containerd

Signed-off-by: Simão Reis <[email protected]>
laincloud · Jan 30, 2019 · 3134161 · 3134161
1 parent 0d9dc3f
commit 3134161
Showing 1 changed file with 2 additions and 2 deletions.
diff --git a/libcontainerd/supervisor/remote_daemon.go b/libcontainerd/supervisor/remote_daemon.go
@@ -311,15 +311,15 @@ func (r *remote) monitorDaemon(ctx context.Context) {
 				delay = time.After(time.Duration(transientFailureCount) * 200 * time.Millisecond)
 				continue
 			}
+			client.Close()
+			client = nil
 		}
 
 		if system.IsProcessAlive(r.daemonPid) {
 			r.logger.WithField("pid", r.daemonPid).Info("killing and restarting containerd")
 			r.killDaemon()
 		}
 
-		client.Close()
-		client = nil
 		r.daemonPid = -1
 		delay = nil
 		transientFailureCount = 0