Skip to content

Commit

Permalink
[v1.34.x] encoding/proto: do not panic when types do not match (grpc#…
Browse files Browse the repository at this point in the history
  • Loading branch information
menghanl committed Feb 26, 2021
1 parent dc1307f commit f948e6e
Showing 1 changed file with 12 additions and 2 deletions.
14 changes: 12 additions & 2 deletions encoding/proto/proto.go
Original file line number Diff line number Diff line change
Expand Up @@ -21,6 +21,8 @@
package proto

import (
"fmt"

"github.com/golang/protobuf/proto"
"google.golang.org/grpc/encoding"
)
Expand All @@ -36,11 +38,19 @@ func init() {
type codec struct{}

func (codec) Marshal(v interface{}) ([]byte, error) {
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.Message", v)
}
return proto.Marshal(vv)
}

func (codec) Unmarshal(data []byte, v interface{}) error {
return proto.Unmarshal(data, v.(proto.Message))
vv, ok := v.(proto.Message)
if !ok {
return fmt.Errorf("failed to unmarshal, message is %T, want proto.Message", v)
}
return proto.Unmarshal(data, vv)
}

func (codec) Name() string {
Expand Down

0 comments on commit f948e6e

Please sign in to comment.