github/containerd
2
0
Fork 0
Code Issues Pull Requests Packages Projects Releases 2 Wiki Activity

Merge pull request #2976 from Random-Liu/fix-potential-panic

Browse Source 
Fix potential containerd panic.
This commit is contained in:
Michael Crosby 2019-02-05 09:43:32 -05:00 committed by GitHub
commit 5ba368748b
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 9 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
process.go
View File

@ -111,9 +111,11 @@ func (p *process) Start(ctx context.Context) error {
ExecID: p.id, ExecID: p.id,
}) })
if err != nil { if err != nil {
p.io.Cancel() if p.io != nil {
p.io.Wait() p.io.Cancel()
p.io.Close() p.io.Wait()
p.io.Close()
}
return errdefs.FromGRPC(err) return errdefs.FromGRPC(err)
} }
p.pid = r.Pid p.pid = r.Pid

6
task.go
View File

@ -189,8 +189,10 @@ func (t *task) Start(ctx context.Context) error {
ContainerID: t.id, ContainerID: t.id,
}) })
if err != nil { if err != nil {
t.io.Cancel() if t.io != nil {
t.io.Close() t.io.Cancel()
t.io.Close()
}
return errdefs.FromGRPC(err) return errdefs.FromGRPC(err)
} }
t.pid = r.Pid t.pid = r.Pid