fix: solve null pointer reference when unmarshaling (#658)

tembleking · web-flow · commit a891d347c13b · 2025-07-16T08:20:08.000Z
diff --git a/sysdig/internal/client/v2/organization.go b/sysdig/internal/client/v2/organization.go
@@ -41,6 +41,7 @@ func (c *Client) CreateOrganizationSecure(ctx context.Context, org *Organization
 		return nil, errStatus, err
 	}
 
+	organization = &OrganizationSecure{}
 	err = c.unmarshalCloudauthProto(response.Body, organization)
 	if err != nil {
 		return nil, "", err
@@ -64,6 +65,7 @@ func (c *Client) GetOrganizationSecure(ctx context.Context, orgID string) (organ
 		return nil, errStatus, err
 	}
 
+	organization = &OrganizationSecure{}
 	err = c.unmarshalCloudauthProto(response.Body, organization)
 	if err != nil {
 		return nil, "", err
@@ -110,6 +112,7 @@ func (c *Client) UpdateOrganizationSecure(ctx context.Context, orgID string, org
 		return nil, errStatus, err
 	}
 
+	organization = &OrganizationSecure{}
 	err = c.unmarshalCloudauthProto(response.Body, organization)
 	if err != nil {
 		return nil, "", err

Original file line number	Diff line number	Diff line change
`@@ -41,6 +41,7 @@ func (c Client) CreateOrganizationSecure(ctx context.Context, org Organization`
`41`	`41`	`return nil, errStatus, err`
`42`	`42`	`}`
`43`	`43`
	`44`	`+ organization = &OrganizationSecure{}`
`44`	`45`	`err = c.unmarshalCloudauthProto(response.Body, organization)`
`45`	`46`	`if err != nil {`
`46`	`47`	`return nil, "", err`
`@@ -64,6 +65,7 @@ func (c *Client) GetOrganizationSecure(ctx context.Context, orgID string) (organ`
`64`	`65`	`return nil, errStatus, err`
`65`	`66`	`}`
`66`	`67`
	`68`	`+ organization = &OrganizationSecure{}`
`67`	`69`	`err = c.unmarshalCloudauthProto(response.Body, organization)`
`68`	`70`	`if err != nil {`
`69`	`71`	`return nil, "", err`
`@@ -110,6 +112,7 @@ func (c *Client) UpdateOrganizationSecure(ctx context.Context, orgID string, org`
`110`	`112`	`return nil, errStatus, err`
`111`	`113`	`}`
`112`	`114`
	`115`	`+ organization = &OrganizationSecure{}`
`113`	`116`	`err = c.unmarshalCloudauthProto(response.Body, organization)`
`114`	`117`	`if err != nil {`
`115`	`118`	`return nil, "", err`