Skip to content

Commit 9a90d5a

Browse files
committed
Merge branch '3.1' into 3.2
2 parents ea350a0 + 3d437fc commit 9a90d5a

2 files changed

Lines changed: 13 additions & 10 deletions

File tree

release-notes/VERSION

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -64,10 +64,10 @@ No changes since 3.2.0
6464
#720: (smile) `SmileGenerator` int overflow in `maxLen` for very long Strings
6565
(>= 715,827,882 chars) causes `ArrayIndexOutOfBoundsException`
6666
(reported by Benjamin M)
67-
#725: (cbor) Ensure `maxNameLength` limit enforced for CBOR parser
68-
(NOTE: 3.x also needed the check on the `nextNameMatch()` decoding path)
69-
#726: (smile) Ensure `maxNameLength` limit enforced for Smile parser
70-
(reported by @tinyb0y)
67+
#725: (cbor) Ensure `maxNameLength` limit enforced for CBOR parser [CVE-2026-68495]
68+
(reported by @tinyb0y)
69+
#726: (smile) Ensure `maxNameLength` limit enforced for Smile parser [CVE-2026-68496]
70+
(reported by @tinyb0y)
7171
#727: (cbor) `CBORParser.nextName(SerializableString)` confuses 5-bit length
7272
marker 23 with 24 ("1-byte length suffix follows")
7373
#728: (cbor) `CBORParser.nextName(SerializableString)` consumes Object entry

release-notes/VERSION-2.x

Lines changed: 9 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -26,8 +26,9 @@ No changes since 2.22
2626
buffer reload
2727
#715: (protobuf) `ProtobufGenerator._reportWrongWireType()` always reports `string`,
2828
ignoring actual type
29-
#725: (cbor) Ensure `maxNameLength` limit enforced for CBOR parser
30-
#726: (smile) Ensure `maxNameLength` limit enforced for Smile parser
29+
#725: (cbor) Ensure `maxNameLength` limit enforced for CBOR parser [CVE-2026-68495]
30+
(reported by @tinyb0y)
31+
#726: (smile) Ensure `maxNameLength` limit enforced for Smile parser [CVE-2026-68496]
3132
(reported by @tinyb0y)
3233
#727: (cbor) `CBORParser.nextFieldName(SerializableString)` confuses 5-bit length
3334
marker 23 with 24 ("1-byte length suffix follows")
@@ -59,8 +60,9 @@ No changes since 2.21
5960
#720: (smile) `SmileGenerator` int overflow in `maxLen` for very long Strings
6061
(>= 715,827,882 chars) causes `ArrayIndexOutOfBoundsException`
6162
(reported by Benjamin M)
62-
#725: (cbor) Ensure `maxNameLength` limit enforced for CBOR parser
63-
#726: (smile) Ensure `maxNameLength` limit enforced for Smile parser
63+
#725: (cbor) Ensure `maxNameLength` limit enforced for CBOR parser [CVE-2026-68495]
64+
(reported by @tinyb0y)
65+
#726: (smile) Ensure `maxNameLength` limit enforced for Smile parser [CVE-2026-68496]
6466
(reported by @tinyb0y)
6567
#727: (cbor) `CBORParser.nextFieldName(SerializableString)` confuses 5-bit length
6668
marker 23 with 24 ("1-byte length suffix follows")
@@ -201,8 +203,9 @@ No changes since 2.19.1
201203

202204
2.18.10 (not yet released)
203205

204-
#725: (cbor) Ensure `maxNameLength` limit enforced for CBOR parser
205-
#726: (smile) Ensure `maxNameLength` limit enforced for Smile parser
206+
#725: (cbor) Ensure `maxNameLength` limit enforced for CBOR parser [CVE-2026-68495]
207+
(reported by @tinyb0y)
208+
#726: (smile) Ensure `maxNameLength` limit enforced for Smile parser [CVE-2026-68496]
206209
(reported by @tinyb0y)
207210
#727: (cbor) `CBORParser.nextFieldName(SerializableString)` confuses 5-bit length
208211
marker 23 with 24 ("1-byte length suffix follows")

0 commit comments

Comments
 (0)