unistack-org/micro-codec-jsonpb
4
0
Fork 0
Code Issues Pull Requests Packages Projects Releases 18 Wiki Activity

fix nil buf check

Browse Source 
Signed-off-by: Vasiliy Tolstov <v.tolstov@unistack.org>
This commit is contained in:
Василий Толстов 2021-04-12 19:13:29 +03:00
parent 87e4e04634
commit aa06453219
1 changed files with 4 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
jsonpb.go
View File

@ -39,7 +39,7 @@ func (c *jsonpbCodec) Marshal(v interface{}) ([]byte, error) {
} }
func (c *jsonpbCodec) Unmarshal(d []byte, v interface{}) error { func (c *jsonpbCodec) Unmarshal(d []byte, v interface{}) error {
if d == nil { if len(d) == 0 {
return nil return nil
} }
switch m := v.(type) { switch m := v.(type) {
@ -65,6 +65,8 @@ func (c *jsonpbCodec) ReadBody(conn io.Reader, b interface{}) error {
buf, err := ioutil.ReadAll(conn) buf, err := ioutil.ReadAll(conn)
if err != nil { if err != nil {
return err return err
} else if len(buf) == 0 {
return nil
} }
m.Data = buf m.Data = buf
return nil return nil
@ -72,7 +74,7 @@ func (c *jsonpbCodec) ReadBody(conn io.Reader, b interface{}) error {
buf, err := ioutil.ReadAll(conn) buf, err := ioutil.ReadAll(conn)
if err != nil { if err != nil {
return err return err
} else if buf == nil { } else if len(buf) == 0 {
return nil return nil
} }
return JsonpbUnmarshaler.Unmarshal(buf, m) return JsonpbUnmarshaler.Unmarshal(buf, m)