Merge pull request #387 from tangle329/master

Check n.IPAM before use it in LoadIPAMConfig function
containernetworking · Mar 2, 2017 · 1f6efc2 · 1f6efc2
2 parents 75a5cf1 + 1003822
commit 1f6efc2
Showing 1 changed file with 4 additions and 4 deletions.
diff --git a/plugins/ipam/host-local/backend/allocator/config.go b/plugins/ipam/host-local/backend/allocator/config.go
@@ -54,6 +54,10 @@ func LoadIPAMConfig(bytes []byte, args string) (*IPAMConfig, string, error) {
 		return nil, "", err
 	}
 
+	if n.IPAM == nil {
+		return nil, "", fmt.Errorf("IPAM config missing 'ipam' key")
+	}
+
 	if args != "" {
 		n.IPAM.Args = &IPAMArgs{}
 		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
 	n.IPAM.Name = n.Name