Fix the panic caused by invalid memory address or nil pointer derefer…

…ence when an unexpected NSX response is received. Signed-off-by: Wenqi Qiu <[email protected]>
vmware-tanzu · Jul 29, 2024 · 111ba73 · 111ba73
1 parent 5390f3c
commit 111ba73
Show file tree

Hide file tree

Showing 3 changed files with 5 additions and 5 deletions.
diff --git a/pkg/nsx/services/subnet/subnet.go b/pkg/nsx/services/subnet/subnet.go
@@ -234,8 +234,8 @@ func (service *SubnetService) GetSubnetStatus(subnet *model.VpcSubnet) ([]model.
 		return nil, err
 	}
 	if statusList.Results[0].NetworkAddress == nil || statusList.Results[0].GatewayAddress == nil {
-		err := errors.New("invalid status result")
-		log.Error(err, fmt.Sprintf("no subnet status found: %+v", statusList))
+		err := fmt.Errorf("invalid status result: %+v", statusList.Results[0])
+		log.Error(err, "invalid subnet status")
 		return nil, err
 	}
 	return statusList.Results, nil

diff --git a/pkg/nsx/services/subnetport/subnetport.go b/pkg/nsx/services/subnetport/subnetport.go
@@ -250,7 +250,7 @@ func (service *SubnetPortService) GetGatewayPrefixForSubnetPort(obj *v1alpha1.Su
 	}
 	status := statusList.Results[0]
 	if *status.Status != model.VpcSubnetStatus_STATUS_SUCCESS || status.GatewayAddress == nil {
-		err := errors.New(fmt.Sprintf("invalid status result: %v", status))
+		err := fmt.Errorf("invalid status result: %+v", status)
 		log.Error(err, "invalid subnet status")
 		return "", -1, err
 	}

diff --git a/pkg/nsx/services/vpc/vpc.go b/pkg/nsx/services/vpc/vpc.go
@@ -488,8 +488,8 @@ func (s *VPCService) GetAVISubnetInfo(vpc model.Vpc) (string, string, error) {
 	}
 
 	if statusList.Results[0].NetworkAddress == nil {
-		err := errors.New("invalid status result")
-		log.Error(err, fmt.Sprintf("no subnet status found: %+v", statusList))
+		err := fmt.Errorf("invalid status result: %+v", statusList.Results[0])
+		log.Error(err, "invalid subnet status")
 		return "", "", err
 	}