marshall: allow unmarshalling into nil byte slice (apache#958)

jameshartig · Aug 12, 2017 · 6563b45 · 6563b45
1 parent 44be8dc
commit 6563b45
Show file tree

Hide file tree

Showing 2 changed files with 10 additions and 4 deletions.
diff --git a/marshal.go b/marshal.go
@@ -230,12 +230,11 @@ func unmarshalVarchar(info TypeInfo, data []byte, value interface{}) error {
 		*v = string(data)
 		return nil
 	case *[]byte:
-		var dataCopy []byte
 		if data != nil {
-			dataCopy = make([]byte, len(data))
-			copy(dataCopy, data)
+			*v = copyBytes(data)
+		} else {
+			*v = nil
 		}
-		*v = dataCopy
 		return nil
 	}
 	rv := reflect.ValueOf(value)

diff --git a/marshal_test.go b/marshal_test.go
@@ -851,6 +851,13 @@ var marshalTests = []struct {
 		nil,
 		nil,
 	},
+	{
+		NativeType{proto: 2, typ: TypeBlob},
+		[]byte(nil),
+		([]byte)(nil),
+		nil,
+		nil,
+	},
 }
 
 func decimalize(s string) *inf.Dec {