195893d381
Since commite9b9e4ace2has landed, there is a chance that container.RWLayer is nil (due to some half-removed container). Let's check the pointer before use to avoid any potential nil pointer dereferences, resulting in a daemon crash. Note that even without the abovementioned commit, it's better to perform an extra check (even it's totally redundant) rather than to have a possibility of a daemon crash. In other words, better be safe than sorry. [v2: add a test case for daemon.getInspectData] [v3: add a check for container.Dead and a special error for the case] Fixes:e9b9e4ace2Signed-off-by: Kir Kolyshkin <kolyshkin@gmail.com>
34 lines
841 B
Go
34 lines
841 B
Go
package daemon // import "github.com/docker/docker/daemon"
|
|
|
|
import (
|
|
"errors"
|
|
"runtime"
|
|
"time"
|
|
|
|
"github.com/docker/docker/pkg/archive"
|
|
)
|
|
|
|
// ContainerChanges returns a list of container fs changes
|
|
func (daemon *Daemon) ContainerChanges(name string) ([]archive.Change, error) {
|
|
start := time.Now()
|
|
container, err := daemon.GetContainer(name)
|
|
if err != nil {
|
|
return nil, err
|
|
}
|
|
|
|
if runtime.GOOS == "windows" && container.IsRunning() {
|
|
return nil, errors.New("Windows does not support diff of a running container")
|
|
}
|
|
|
|
container.Lock()
|
|
defer container.Unlock()
|
|
if container.RWLayer == nil {
|
|
return nil, errors.New("RWLayer of container " + name + " is unexpectedly nil")
|
|
}
|
|
c, err := container.RWLayer.Changes()
|
|
if err != nil {
|
|
return nil, err
|
|
}
|
|
containerActions.WithValues("changes").UpdateSince(start)
|
|
return c, nil
|
|
}
|