Skip to content
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

Jump to bottom

sdk: check for empty response body before unmarshalling #879

Merged
merged 2 commits into from
Feb 9, 2024
Merged

sdk: check for empty response body before unmarshalling #879

Changes from 1 commit
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
14a5fa3
check for empty resp body before unmarshalling
catriona-m Feb 9, 2024
b295bc6
check xml for empty resp body before unmarshalling
catriona-m Feb 9, 2024
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
5 changes: 5 additions & 0 deletions sdk/client/client.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -189,6 +189,11 @@ func (r *Response) Unmarshal(model interface{}) error {
// Trim away a BOM if present
respBody = bytes.TrimPrefix(respBody, []byte("\xef\xbb\xbf"))

// In some cases the respBody is empty, but not nil, so don't attempt to unmarshal this
if len(respBody) == 0 {
return nil
}
Comment on lines +192 to +195
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Mind implementing the same fix for XML deserialization too (but not for the bytes deserialization, which'd want that context)?


// Unmarshal into provided model
if err := json.Unmarshal(respBody, model); err != nil {
return fmt.Errorf("unmarshaling response body: %+v", err)
Expand Down
Loading