jsonpb: check for nil in Marshal and return error to avoid panic. #469
Conversation
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
dsnet
reviewed
Dec 9, 2017
jsonpb/jsonpb_test.go
Outdated
| var msg *pb.Simple | ||
| m := &Marshaler{} | ||
| if _, err := m.MarshalToString(msg); err == nil { | ||
| t.Errorf("mashalling nil returned no error") |
There was a problem hiding this comment.
Nit: It seems the convention is usually one l.
s/marshalling/marshaling/
jsonpb/jsonpb.go
Outdated
| @@ -118,6 +118,9 @@ type JSONPBUnmarshaler interface { | |||
|
|
|||
| // Marshal marshals a protocol buffer into JSON. | |||
| func (m *Marshaler) Marshal(out io.Writer, pb proto.Message) error { | |||
| if pb == nil || reflect.ValueOf(pb).IsNil() { | |||
There was a problem hiding this comment.
This assumes that pb is a pointer, which is not always true.
There was a problem hiding this comment.
Ah yes. Switched to checking for pointer only. I'm guessing I shouldn't worry about nil maps, slices, etc.
Fixed check for nil to pointer types only.
cybrcodr
commented
Dec 9, 2017
jsonpb/jsonpb.go
Outdated
| @@ -118,6 +118,9 @@ type JSONPBUnmarshaler interface { | |||
|
|
|||
| // Marshal marshals a protocol buffer into JSON. | |||
| func (m *Marshaler) Marshal(out io.Writer, pb proto.Message) error { | |||
| if pb == nil || reflect.ValueOf(pb).IsNil() { | |||
There was a problem hiding this comment.
Ah yes. Switched to checking for pointer only. I'm guessing I shouldn't worry about nil maps, slices, etc.
jsonpb/jsonpb_test.go
Outdated
| var msg *pb.Simple | ||
| m := &Marshaler{} | ||
| if _, err := m.MarshalToString(msg); err == nil { | ||
| t.Errorf("mashalling nil returned no error") |
dsnet
approved these changes
Dec 11, 2017
Sign up for free
to subscribe to this conversation on GitHub.
Already have an account?
Sign in.
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
Add check for nil in Marshal and return error to avoid panic.