Zero length binary values should not be nil

vcabbage · Jul 16, 2019 · ad1b5de · ad1b5de
1 parent de9a8ae
commit ad1b5de
Showing 1 changed file with 6 additions and 0 deletions.
diff --git a/decode.go b/decode.go
@@ -571,6 +571,12 @@ func readBinary(r *buffer) ([]byte, error) {
 		return nil, errorErrorf("type code %#02x is not a recognized binary type", type_)
 	}
 
+	if length == 0 {
+		// An empty value and a nil value are distinct,
+		// ensure that the returned value is not nil in this case.
+		return make([]byte, 0), nil
+	}
+
 	buf, ok := r.next(length)
 	if !ok {
 		return nil, errorNew("invalid length")