From f627fea89e7e1bbdca48572f6e95ccb5b78e1b09 Mon Sep 17 00:00:00 2001
From: Vasiliy Tolstov <v.tolstov@unistack.org>
Date: Wed, 25 Nov 2020 12:24:14 +0300
Subject: [PATCH] add nil check

Signed-off-by: Vasiliy Tolstov <v.tolstov@unistack.org>
---
 proto.go | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

diff --git a/proto.go b/proto.go
index 172d3bc..3507f88 100644
--- a/proto.go
+++ b/proto.go
@@ -13,6 +13,9 @@ import (
 type protoCodec struct{}
 
 func (c *protoCodec) Marshal(v interface{}) ([]byte, error) {
+	if v == nil {
+		return nil, nil
+	}
 	switch m := v.(type) {
 	case *codec.Frame:
 		return m.Data, nil
@@ -25,7 +28,7 @@ func (c *protoCodec) Marshal(v interface{}) ([]byte, error) {
 }
 
 func (c *protoCodec) Unmarshal(d []byte, v interface{}) error {
-	if d == nil {
+	if d == nil || v == nil {
 		return nil
 	}
 	switch m := v.(type) {