Sync feature/stream-mode to release v2.9.1

[fxamacker]

This PR merges v2.9.1 into feature/stream-mode branch. v2.9.1 was tagged on Monday morning, March 30, 2026.

v2.9.1 includes important bugfixes, defensive checks, improved code quality, and more tests. Although not public, the fuzzer was also improved by adding more fuzz tests.

See v2.9.1 release notes for more details.

Conflict Resolution

commit 6fc4b610f8f69a74d3ce9e1539ffa1172ddc475d
Merge: 39888e6 63d1c66
Author: Faye Amacker <33205765+fxamacker@users.noreply.github.com>
Date:   Mon Mar 30 12:25:16 2026 -0500

    Merge tag 'v2.9.1' into fxamacker/update-streammode-to-release-v291

diff --git a/decode_test.go b/decode_test.go
remerge CONFLICT (content): Merge conflict in decode_test.go
index 8be9555..8f66eb7 100644
--- a/decode_test.go
+++ b/decode_test.go
@@ -3500,28 +3500,27 @@ var invalidCBORUnmarshalTestCases = []struct {
 		data:         mustHexDecode("00830102"),
 		wantErrorMsg: "cbor: 3 bytes of extraneous data starting at index 1",
 	},
-<<<<<<< 39888e6 (Merge pull request #715 from fxamacker/fxamacker/sync-stream-mode-branch-with-master)
-	// more
+	// End of input
 	{
-		name:         "End of input in a head",
+		name:         "end of input in a head",
 		data:         mustHexDecode("59"),
 		wantErrorMsg: "unexpected EOF",
 	},
 	{
-		name:         "End of input in a head",
+		name:         "end of input in a head",
 		data:         mustHexDecode("5b"),
 		wantErrorMsg: "unexpected EOF",
 	},
 	{
-		name:         "End of input in a head",
+		name:         "end of input in a head",
 		data:         mustHexDecode("d8"),
 		wantErrorMsg: "unexpected EOF",
 	},
 	{
-		name:         "End of input in a head",
+		name:         "end of input in a head",
 		data:         mustHexDecode("d9"),
 		wantErrorMsg: "unexpected EOF",
-=======
+	},
 	// Indefinite-length map
 	{
 		name:         "indefinite-length map with one key and no value",
@@ -3532,7 +3531,6 @@ var invalidCBORUnmarshalTestCases = []struct {
 		name:         "indefinite-length map with two keys and one value",
 		data:         []byte{0xbf, 0x61, 'a', 0x01, 0x61, 'b', 0xff},
 		wantErrorMsg: `cbor: unexpected "break" code`,
->>>>>>> 63d1c66 (Merge pull request #758 from fxamacker/fxamacker/update-readme-for-release)
 	},
 }
 
diff --git a/stream.go b/stream.go
remerge CONFLICT (content): Merge conflict in stream.go
index 6c48b46..a61928b 100644
--- a/stream.go
+++ b/stream.go
@@ -175,9 +175,8 @@ func NewEncoder(w io.Writer) *Encoder {
 	return defaultEncMode.NewEncoder(w)
 }
 
-<<<<<<< 39888e6 (Merge pull request #715 from fxamacker/fxamacker/sync-stream-mode-branch-with-master)
 func (enc *Encoder) checkIndefiniteLengthDataItemTypeIfNeeded(v interface{}) error {
-	if len(enc.indefTypes) == 0 || v == nil {
+	if len(enc.indefTypes) == 0 {
 		return nil
 	}
 
@@ -187,15 +186,6 @@ func (enc *Encoder) checkIndefiniteLengthDataItemTypeIfNeeded(v interface{}) err
 
 func checkIndefiniteLengthDataItemType(indefType cborType, v interface{}) error {
 	switch indefType {
-	case cborTypeTextString:
-		k := reflect.TypeOf(v).Kind()
-		if k != reflect.String {
-			return errors.New("cbor: cannot encode item type " + k.String() + " for indefinite-length text string")
-=======
-// Encode writes the CBOR encoding of v.
-func (enc *Encoder) Encode(v any) error {
-	if len(enc.indefTypes) > 0 {
-		switch enc.indefTypes[len(enc.indefTypes)-1] {
 	case cborTypeTextString:
 		if v == nil {
 			return errors.New("cbor: cannot encode nil for indefinite-length text string")
@@ -204,6 +194,7 @@ func (enc *Encoder) Encode(v any) error {
 		if k != reflect.String {
 			return errors.New("cbor: cannot encode item type " + k.String() + " for indefinite-length text string")
 		}
+
 	case cborTypeByteString:
 		if v == nil {
 			return errors.New("cbor: cannot encode nil for indefinite-length byte string")
@@ -213,15 +204,6 @@ func (enc *Encoder) Encode(v any) error {
 		if (k != reflect.Array && k != reflect.Slice) || t.Elem().Kind() != reflect.Uint8 {
 			return errors.New("cbor: cannot encode item type " + k.String() + " for indefinite-length byte string")
 		}
->>>>>>> 63d1c66 (Merge pull request #758 from fxamacker/fxamacker/update-readme-for-release)
-		}
-
-	case cborTypeByteString:
-		t := reflect.TypeOf(v)
-		k := t.Kind()
-		if (k != reflect.Array && k != reflect.Slice) || t.Elem().Kind() != reflect.Uint8 {
-			return errors.New("cbor: cannot encode item type " + k.String() + " for indefinite-length byte string")
-		}
 	}
 
 	return nil

[turbolent]

👍