Merge pull request kubernetes#85975 from ldx/azure-fix-nilptr

k8s-ci-robot · web-flow · commit 6f6107260615 · 2019-12-26T16:43:38.000-08:00
Fix nil pointer dereference in the azure provider
diff --git a/staging/src/k8s.io/legacy-cloud-providers/azure/azure_standard.go b/staging/src/k8s.io/legacy-cloud-providers/azure/azure_standard.go
@@ -481,7 +481,7 @@ func (as *availabilitySet) GetZoneByNodeName(name string) (cloudprovider.Zone, e
 		failureDomain = as.makeZone(to.String(vm.Location), zoneID)
 	} else {
 		// Availability zone is not used for the node, falling back to fault domain.
-		failureDomain = strconv.Itoa(int(*vm.VirtualMachineProperties.InstanceView.PlatformFaultDomain))
+		failureDomain = strconv.Itoa(int(to.Int32(vm.VirtualMachineProperties.InstanceView.PlatformFaultDomain)))
 	}
 
 	zone := cloudprovider.Zone{

Original file line number	Diff line number	Diff line change
`@@ -481,7 +481,7 @@ func (as *availabilitySet) GetZoneByNodeName(name string) (cloudprovider.Zone, e`
`481`	`481`	`failureDomain = as.makeZone(to.String(vm.Location), zoneID)`
`482`	`482`	`} else {`
`483`	`483`	`// Availability zone is not used for the node, falling back to fault domain.`
`484`		`- failureDomain = strconv.Itoa(int(*vm.VirtualMachineProperties.InstanceView.PlatformFaultDomain))`
	`484`	`+ failureDomain = strconv.Itoa(int(to.Int32(vm.VirtualMachineProperties.InstanceView.PlatformFaultDomain)))`
`485`	`485`	`}`
`486`	`486`
`487`	`487`	`zone := cloudprovider.Zone{`