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:
Akihiro Suda 2023-05-29 09:54:07 +09:00 committed by GitHub
commit 143a25144a
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23

View file

@ -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")