toolshed/docker-cli
1
0
Fork 0
Code Issues Pull Requests Actions 1 Packages Projects Releases Wiki Activity

Fix nil pointer derefence on failure to connect to containerd

Browse Source 
Signed-off-by: Simão Reis <smnrsti@gmail.com>
(cherry picked from commit 3134161be3f578ff009673786684b3abbe9abb3f)
Signed-off-by: Sebastiaan van Stijn <github@gone.nl>
Upstream-commit: 0841c61862e66c47ec735ad9de0039b806de37aa
Component: engine
This commit is contained in:
Simão Reis
2019-01-30 12:41:54 -01:00
committed by Sebastiaan van Stijn
parent c835df1d14
commit 8af9b67ca8
1 changed files with 2 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
components/engine/libcontainerd/supervisor/remote_daemon.go
View File

@ -311,6 +311,8 @@ 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) {
@ -318,8 +320,6 @@ func (r *remote) monitorDaemon(ctx context.Context) {
r.killDaemon()
}
client.Close()
client = nil
r.daemonPid = -1
delay = nil
transientFailureCount = 0