fix nil buf check

Signed-off-by: Vasiliy Tolstov <[email protected]>
unistack-org · Apr 12, 2021 · 8ecea82 · 8ecea82
1 parent adbd069
commit 8ecea82
Show file tree

Hide file tree

Showing 2 changed files with 6 additions and 2 deletions.
diff --git a/json/json.go b/json/json.go
@@ -53,7 +53,7 @@ func (c *jsonCodec) Marshal(b interface{}) ([]byte, error) {
 }
 
 func (c *jsonCodec) Unmarshal(b []byte, v interface{}) error {
-	if b == nil {
+	if len(b) == 0 {
 		return nil
 	}
 	switch m := v.(type) {
@@ -80,6 +80,8 @@ func (c *jsonCodec) ReadBody(conn io.Reader, b interface{}) error {
 		buf, err := ioutil.ReadAll(conn)
 		if err != nil {
 			return err
+		} else if len(buf) == 0 {
+			return nil
 		}
 		m.Data = buf
 		return nil

diff --git a/proto/proto.go b/proto/proto.go
@@ -54,14 +54,16 @@ func (c *protoCodec) ReadBody(conn io.Reader, b interface{}) error {
 		buf, err := ioutil.ReadAll(conn)
 		if err != nil {
 			return err
+		} else if len(buf) == 0 {
+			return nil
 		}
 		m.Data = buf
 		return nil
 	case newproto.Message, proto.Message:
 		buf, err := ioutil.ReadAll(conn)
 		if err != nil {
 			return err
-		} else if buf == nil {
+		} else if len(buf) == 0 {
 			return nil
 		}
 		return proto.Unmarshal(buf, m)