Merge pull request free5gc#116 from ShouheiNishi/fix/issue587

Add nil check for httpResponse in SendConvergedChargingRequest
pf-lin · Aug 7, 2024 · db0b9a7 · db0b9a7
2 parents 65bc752 + 0ca2c22
commit db0b9a7
Showing 1 changed file with 8 additions and 4 deletions.
diff --git a/internal/sbi/consumer/chf_service.go b/internal/sbi/consumer/chf_service.go
@@ -144,8 +144,10 @@ func (s *nchfService) SendConvergedChargingRequest(
 	switch requestType {
 	case smf_context.CHARGING_INIT:
 		rsp, httpResponse, err = client.DefaultApi.ChargingdataPost(ctx, *req)
-		chargingDataRef := strings.Split(httpResponse.Header.Get("Location"), "/")
-		smContext.ChargingDataRef = chargingDataRef[len(chargingDataRef)-1]
+		if httpResponse != nil {
+			chargingDataRef := strings.Split(httpResponse.Header.Get("Location"), "/")
+			smContext.ChargingDataRef = chargingDataRef[len(chargingDataRef)-1]
+		}
 	case smf_context.CHARGING_UPDATE:
 		rsp, httpResponse, err = client.DefaultApi.ChargingdataChargingDataRefUpdatePost(
 			ctx, smContext.ChargingDataRef, *req)
@@ -155,8 +157,10 @@ func (s *nchfService) SendConvergedChargingRequest(
 	}
 
 	defer func() {
-		if resCloseErr := httpResponse.Body.Close(); resCloseErr != nil {
-			logger.ChargingLog.Errorf("RegisterNFInstance response body cannot close: %+v", resCloseErr)
+		if httpResponse != nil {
+			if resCloseErr := httpResponse.Body.Close(); resCloseErr != nil {
+				logger.ChargingLog.Errorf("RegisterNFInstance response body cannot close: %+v", resCloseErr)
+			}
 		}
 	}()