Skip to content

json: skip unmarshal when DecodeClientResponse reply is nil #102

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
team-humaki wants to merge 1 commit into
base: main
Choose a base branch
from
Open

json: skip unmarshal when DecodeClientResponse reply is nil #102

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
3 changes: 3 additions & 0 deletions json/client.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -66,5 +66,8 @@ func DecodeClientResponse(r io.Reader, reply interface{}) error {
if c.Result == nil {
return errors.New("result is null")
}
if reply == nil {
return nil
}
return json.Unmarshal(*c.Result, reply)
}
17 changes: 17 additions & 0 deletions json/json_test.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -135,3 +135,20 @@ func TestServiceBeforeAfter(t *testing.T) {
t.Errorf("Expected after in context to be 'After is true', got %s", afterValue)
}
}

func TestDecodeClientResponseNilReply(t *testing.T) {
ok := `{"id":1,"result":{"Result":8},"error":null}`
if err := DecodeClientResponse(bytes.NewReader([]byte(ok)), nil); err != nil {
t.Error("Expected nil reply to skip result unmarshal, got:", err)
}

rpcErr := `{"id":1,"result":null,"error":"response error"}`
if err := DecodeClientResponse(bytes.NewReader([]byte(rpcErr)), nil); err == nil {
t.Error("Expected RPC error even when reply is nil")
}

nullRes := `{"id":1,"result":null,"error":null}`
if err := DecodeClientResponse(bytes.NewReader([]byte(nullRes)), nil); err == nil {
t.Error("Expected error for null result even when reply is nil")
}
}
4 changes: 4 additions & 0 deletions v2/json2/client.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -79,5 +79,9 @@ func DecodeClientResponse(r io.Reader, reply interface{}) error {
return ErrNullResult
}

if reply == nil {
return nil
}

return json.Unmarshal(*c.Result, reply)
}
21 changes: 21 additions & 0 deletions v2/json2/json_test.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -289,3 +289,24 @@ func TestDecodeNullResult(t *testing.T) {
t.Error("Expected result to be nil, but got:", result)
}
}

func TestDecodeClientResponseNilReply(t *testing.T) {
ok := `{"jsonrpc":"2.0","id":1,"result":{"Result":8}}`
if err := DecodeClientResponse(bytes.NewReader([]byte(ok)), nil); err != nil {
t.Error("Expected nil reply to skip result unmarshal, got:", err)
}

rpcErr := `{"jsonrpc":"2.0","id":1,"error":{"code":-32000,"message":"response error"}}`
if err := DecodeClientResponse(bytes.NewReader([]byte(rpcErr)), nil); err == nil {
t.Error("Expected RPC error even when reply is nil")
} else if jsonRpcErr, ok := err.(*Error); !ok {
t.Errorf("Expected *Error, got %T: %s", err, err)
} else if jsonRpcErr.Message != "response error" {
t.Errorf("Expected message %q, got %q", "response error", jsonRpcErr.Message)
}

nullRes := `{"jsonrpc":"2.0","id":1,"result":null}`
if err := DecodeClientResponse(bytes.NewReader([]byte(nullRes)), nil); err != ErrNullResult {
t.Error("Expected ErrNullResult for null result even when reply is nil, got:", err)
}
}
Loading