unistack-org/micro-client-grpc
4
0
Fork 1
Code Issues Pull Requests Actions Packages Projects Releases 35 Wiki Activity

client/grpc: fix panic on invalid message (#1191)

Browse Source 
* client/grpc: fix panic on invalid message
* travis: disable lint and race for now

Signed-off-by: Vasiliy Tolstov <v.tolstov@unistack.org>
This commit is contained in:
Василий Толстов 2020-02-13 14:57:21 +03:00
parent a5a238d554
commit 978659a441
1 changed files with 11 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
codec.go
View File

@ -69,15 +69,21 @@ func (w wrapCodec) Unmarshal(data []byte, v interface{}) error {
} }
func (protoCodec) Marshal(v interface{}) ([]byte, error) { func (protoCodec) Marshal(v interface{}) ([]byte, error) {
b, ok := v.(*bytes.Frame) switch m := v.(type) {
if ok { case *bytes.Frame:
return b.Data, nil return m.Data, nil
case proto.Message:
return proto.Marshal(m)
} }
return proto.Marshal(v.(proto.Message)) return nil, fmt.Errorf("failed to marshal: %v is not type of *bytes.Frame or proto.Message", v)
} }
func (protoCodec) Unmarshal(data []byte, v interface{}) error { func (protoCodec) Unmarshal(data []byte, v interface{}) error {
return proto.Unmarshal(data, v.(proto.Message)) m, ok := v.(proto.Message)
if !ok {
return fmt.Errorf("failed to unmarshal: %v is not type of proto.Message", v)
}
return proto.Unmarshal(data, m)
} }
func (protoCodec) Name() string { func (protoCodec) Name() string {