Merge pull request #308 from ipld/dagcbor-coerce-undef-to-null

dagcbor: coerce undef to null.

codec/dagcbor/unmarshal.go

@@ -49,7 +49,9 @@ func (cfg DecodeOptions) Decode(na datamodel.NodeAssembler, r io.Reader) error {
 		return na2.DecodeDagCbor(r)
 	}
 	// Okay, generic builder path.
-	return Unmarshal(na, cbor.NewDecoder(cbor.DecodeOptions{}, r), cfg)
+	return Unmarshal(na, cbor.NewDecoder(cbor.DecodeOptions{
+		CoerceUndefToNull: true,
+	}, r), cfg)
 }
 
 // Future work: we would like to remove the Unmarshal function,

codec/dagcbor/unmarshal_test.go

@@ -4,6 +4,8 @@ import (
 	"strings"
 	"testing"
 
+	"github.com/ipld/go-ipld-prime/datamodel"
+
 	qt "github.com/frankban/quicktest"
 
 	"github.com/ipld/go-ipld-prime/node/basicnode"
@@ -38,4 +40,13 @@ func TestFunBlocks(t *testing.T) {
 		err := Decode(nb, buf)
 		qt.Assert(t, err, qt.Equals, ErrAllocationBudgetExceeded)
 	})
+	t.Run("undef", func(t *testing.T) {
+		// This fixture tests that we tolerate cbor's "undefined" token (even though it's noncanonical and you shouldn't use it),
+		// and that it becomes a null in the data model level.
+		buf := strings.NewReader("\xf7")
+		nb := basicnode.Prototype.Any.NewBuilder()
+		err := Decode(nb, buf)
+		qt.Assert(t, err, qt.IsNil)
+		qt.Assert(t, nb.Build().Kind(), qt.Equals, datamodel.Kind_Null)
+	})
 }