Skip to content

#230: fix nil deref #257

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
reinkrul wants to merge 1 commit into
base: main
Choose a base branch
from
Open

#230: fix nil deref #257

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 1 addition & 3 deletions discovery/service.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,6 +2,7 @@ package discovery

import (
"context"

"github.com/nuts-foundation/go-nuts-client/nuts"
"github.com/nuts-foundation/go-nuts-client/nuts/discovery"
)
Expand All @@ -25,9 +26,6 @@ func (i Service) ActivationStatus(ctx context.Context, serviceID string, subject
if err != nil {
return nil, err
}
if err != nil {
return nil, err
}
result := &DIDStatus{
ServiceID: serviceID,
Active: response.JSON200.Activated,
Expand Down
9 changes: 3 additions & 6 deletions identity/service.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -68,15 +68,12 @@ func (i Service) Get(ctx context.Context, subjectID string) (*IdentityDetails, e

// Get DIDDocuments
for _, currentDID := range identity.DIDs {
resp, err := i.VDRClient.ResolveDID(ctx, currentDID)
httpResponse, err := i.VDRClient.ResolveDID(ctx, currentDID)
response, err := nuts.ParseResponse(err, httpResponse, vdr.ParseResolveDIDResponse)
if err != nil {
return nil, err
}
didResponse, err := vdr.ParseResolveDIDResponse(resp)
if err != nil {
return nil, err
}
result.DIDDocuments = append(result.DIDDocuments, didResponse.JSON200.Document)
result.DIDDocuments = append(result.DIDDocuments, response.JSON200.Document)
}

// Get DiscoveryService status
Expand Down
Loading