docker
/
docs
mirror of https://github.com/docker/docs.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #2831 from nathanleclaire/aws_panic 

Check for nil before deferencing pointer in SG config
This commit is contained in:
Nathan LeClaire 2016-01-13 12:59:49 -08:00
parent 4291b591f2 f17cce330c
commit 4f6fb6dc7e
1 changed files with 9 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
drivers/amazonec2/amazonec2.go
View File

@ -866,13 +866,15 @@ func (d *Driver) configureSecurityGroupPermissions(group *ec2.SecurityGroup) []*
hasDockerPort := false
hasSwarmPort := false
for _, p := range group.IpPermissions {
switch *p.FromPort {
case 22:
hasSshPort = true
case int64(dockerPort):
hasDockerPort = true
case int64(swarmPort):
hasSwarmPort = true
if p.FromPort != nil {
switch *p.FromPort {
case 22:
hasSshPort = true
case int64(dockerPort):
hasDockerPort = true
case int64(swarmPort):
hasSwarmPort = true
}
}
}