ITQC/containernetworking-plugins
24
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases 34 Wiki Activity

Merge pull request #387 from tangle329/master

Browse Source 
Check n.IPAM before use it in LoadIPAMConfig function
This commit is contained in:
Tom Denham 2017-03-02 09:23:02 -08:00 committed by GitHub
commit 1f6efc28b5
1 changed files with 4 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
plugins/ipam/host-local/backend/allocator/config.go
View File

@ -54,6 +54,10 @@ func LoadIPAMConfig(bytes []byte, args string) (*IPAMConfig, string, error) {
return nil, "", err return nil, "", err
} }
if n.IPAM == nil {
return nil, "", fmt.Errorf("IPAM config missing 'ipam' key")
}
if args != "" { if args != "" {
n.IPAM.Args = &IPAMArgs{} n.IPAM.Args = &IPAMArgs{}
err := types.LoadArgs(args, n.IPAM.Args) err := types.LoadArgs(args, n.IPAM.Args)
@ -62,10 +66,6 @@ func LoadIPAMConfig(bytes []byte, args string) (*IPAMConfig, string, error) {
} }
} }
if n.IPAM == nil {
return nil, "", fmt.Errorf("IPAM config missing 'ipam' key")
}
// Copy net name into IPAM so not to drag Net struct around // Copy net name into IPAM so not to drag Net struct around
n.IPAM.Name = n.Name n.IPAM.Name = n.Name