Skip to content

fix: avoid recursive loop when unmarshalling server request #39

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

fix: avoid recursive loop when unmarshalling server request #39

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
17 changes: 6 additions & 11 deletions jsonrpc2/server.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -81,21 +81,16 @@ type serverRequest struct {
ID *json.RawMessage `json:"id"`
}

func (r *serverRequest) reset() {
r.Version = ""
r.Method = ""
r.Params = nil
r.ID = nil
}

func (r *serverRequest) UnmarshalJSON(raw []byte) error {
r.reset()
type req *serverRequest
if err := json.Unmarshal(raw, req(r)); err != nil {
type alias serverRequest

var req alias
if err := json.Unmarshal(raw, &req); err != nil {
return errors.New("bad request")
}
*r = serverRequest(req)

var o = make(map[string]*json.RawMessage)
o := make(map[string]*json.RawMessage)
if err := json.Unmarshal(raw, &o); err != nil {
return errors.New("bad request")
}
Expand Down