Merge pull request #1082 from polyverse-security/mborsa_create_container_nil_pointer

Avoid nil pointer dereference in (*Cluster).createContainer
This commit is contained in:
Andrea Luzzardi 2015-07-31 16:44:46 -07:00
commit 60dc3099f4
1 changed files with 5 additions and 1 deletions

View File

@ -425,7 +425,11 @@ func (e *Engine) Create(config *ContainerConfig, name string, pullImage bool) (*
e.RLock()
defer e.RUnlock()
return e.containers[id], nil
container := e.containers[id]
if container == nil {
err = errors.New("Container created but refresh didn't report it back")
}
return container, err
}
// RemoveContainer a container from the engine.