fix possible nil pointer deref

denniskniep · May 26, 2024 · 4f1c1e0 · 4f1c1e0
1 parent ea64e52
commit 4f1c1e0
Showing 1 changed file with 3 additions and 3 deletions.
diff --git a/internal/clients/searchattribute.go b/internal/clients/searchattribute.go
@@ -88,12 +88,12 @@ func (s *TemporalServiceImpl) ListSearchAttributesByNamespace(ctx context.Contex
 		return nil, err
 	}
 
-	var customAttributes = make([]*core.SearchAttributeObservation, 0, len(response.CustomAttributes))
-
 	if response == nil {
-		return customAttributes, nil
+		return make([]*core.SearchAttributeObservation, 0), nil
 	}
 
+	var customAttributes = make([]*core.SearchAttributeObservation, 0, len(response.CustomAttributes))
+
 	for attrName, attrType := range response.CustomAttributes {
 		customAttribute := core.SearchAttributeObservation{
 			Name:                  attrName,