fix: fix problemDetails nil issue and nil pointer dereferences

free5gc · Sep 10, 2024 · c20a740 · c20a740
1 parent 515e580
commit c20a740
Showing 1 changed file with 11 additions and 3 deletions.
diff --git a/internal/sbi/consumer/nrf_service.go b/internal/sbi/consumer/nrf_service.go
@@ -90,13 +90,13 @@ func (s *nnrfService) SendSearchNFInstances(
 	}
 
 	res, err := client.NFInstancesStoreApi.SearchNFInstances(ctx, &param)
-	result := res.SearchResult
 
-	if err != nil {
+	if err != nil || res == nil {
 		logger.ConsumerLog.Errorf("SearchNFInstances failed: %+v", err)
 		return nil, err
 	}
 
+	result := res.SearchResult
 	return &result, err
 }
 
@@ -116,7 +116,15 @@ func (s *nnrfService) SendDeregisterNFInstance() (problemDetails *models.Problem
 	}
 
 	_, err = client.NFInstanceIDDocumentApi.DeregisterNFInstance(ctx, request)
-	return problemDetails, err
+
+	switch e := err.(type) {
+	case openapi.GenericOpenAPIError:
+		return e.Model().(*models.ProblemDetails), nil
+	case nil:
+		return nil, nil
+	default:
+		return nil, err
+	}
 }
 
 func (s *nnrfService) RegisterNFInstance(ctx context.Context) (