encoding/proto: do not panic when types do not match #4218
Merged
Conversation
This file contains hidden or 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
dfawley
approved these changes
Feb 22, 2021
encoding/proto/proto.go
Outdated
| return proto.Marshal(v.(proto.Message)) | ||
| vv, ok := v.(proto.Message) | ||
| if !ok { | ||
| return nil, fmt.Errorf("failed to marshal, message is %T, want proto", v) |
encoding/proto/proto.go
Outdated
| return proto.Unmarshal(data, v.(proto.Message)) | ||
| vv, ok := v.(proto.Message) | ||
| if !ok { | ||
| return fmt.Errorf("failed to marshal, message is %T, want proto", v) |
dfawley
changed the title
menghanl
force-pushed
the
not_panic_proto_codec
branch
from
2a66eac to
f161aa5
Compare
menghanl
added a commit
to menghanl/grpc-go
that referenced
this pull request
Feb 24, 2021
menghanl
added a commit
that referenced
this pull request
Feb 24, 2021
menghanl
added a commit
to menghanl/grpc-go
that referenced
this pull request
Feb 26, 2021
menghanl
added a commit
to menghanl/grpc-go
that referenced
this pull request
Feb 26, 2021
This was referenced Mar 8, 2021
menghanl
added a commit
that referenced
this pull request
Mar 11, 2021
Co-authored-by: Easwar Swaminathan <[email protected]> This is a cherry pick of - encoding/proto: do not panic when types do not match (#4218) - xds: add env var protection for client-side security (#4247)
menghanl
added a commit
that referenced
this pull request
Mar 11, 2021
Co-authored-by: Easwar Swaminathan <[email protected]> This is a cherry pick of - encoding/proto: do not panic when types do not match (#4218) - xds: add env var protection for client-side security (#4247)
This was referenced Mar 12, 2021
Sign up for free
to subscribe to this conversation on GitHub.
Already have an account?
Sign in.
3 participants
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.
fixes #4213
The type mismatch can happen if
proto.Messageapplication/grpc+subtype)