Merge pull request #45643 from thaJeztah/24.0_backport_exec_npe
[24.0 backport] Fix npe in exec resize when exec errored
This commit is contained in:
commit
143a25144a
1 changed files with 6 additions and 0 deletions
|
@ -5,6 +5,8 @@ import (
|
|||
"errors"
|
||||
"strconv"
|
||||
"time"
|
||||
|
||||
"github.com/docker/docker/errdefs"
|
||||
)
|
||||
|
||||
// ContainerResize changes the size of the TTY of the process running
|
||||
|
@ -48,6 +50,10 @@ func (daemon *Daemon) ContainerExecResize(name string, height, width int) error
|
|||
|
||||
select {
|
||||
case <-ec.Started:
|
||||
// An error may have occurred, so ec.Process may be nil.
|
||||
if ec.Process == nil {
|
||||
return errdefs.InvalidParameter(errors.New("exec process is not started"))
|
||||
}
|
||||
return ec.Process.Resize(context.Background(), uint32(width), uint32(height))
|
||||
case <-timeout.C:
|
||||
return errors.New("timeout waiting for exec session ready")
|
||||
|
|
Loading…
Reference in a new issue