diff --git a/src/libraries/System.Formats.Nrbf/src/System/Formats/Nrbf/ArraySinglePrimitiveRecord.cs b/src/libraries/System.Formats.Nrbf/src/System/Formats/Nrbf/ArraySinglePrimitiveRecord.cs index ab5f68f50be820..5b3b9746394680 100644 --- a/src/libraries/System.Formats.Nrbf/src/System/Formats/Nrbf/ArraySinglePrimitiveRecord.cs +++ b/src/libraries/System.Formats.Nrbf/src/System/Formats/Nrbf/ArraySinglePrimitiveRecord.cs @@ -85,7 +85,7 @@ internal static IReadOnlyList DecodePrimitiveTypes(BinaryReader reader, int c } else if (typeof(T) == typeof(char)) { - return (T[])(object)reader.ReadChars(count); + return (T[])(object)reader.ParseChars(count); } // It's safe to pre-allocate, as we have ensured there is enough bytes in the stream. @@ -206,7 +206,7 @@ private static List DecodeFromNonSeekableStream(BinaryReader reader, int coun } else if (typeof(T) == typeof(char)) { - values.Add((T)(object)reader.ReadChar()); + values.Add((T)(object)reader.ParseChar()); } else if (typeof(T) == typeof(short)) { diff --git a/src/libraries/System.Formats.Nrbf/src/System/Formats/Nrbf/Utils/BinaryReaderExtensions.cs b/src/libraries/System.Formats.Nrbf/src/System/Formats/Nrbf/Utils/BinaryReaderExtensions.cs index cd705223021fcc..ff422c29401a12 100644 --- a/src/libraries/System.Formats.Nrbf/src/System/Formats/Nrbf/Utils/BinaryReaderExtensions.cs +++ b/src/libraries/System.Formats.Nrbf/src/System/Formats/Nrbf/Utils/BinaryReaderExtensions.cs @@ -115,6 +115,18 @@ internal static char ParseChar(this BinaryReader reader) } } + internal static char[] ParseChars(this BinaryReader reader, int count) + { + try + { + return reader.ReadChars(count); + } + catch (ArgumentException) // A surrogate character was read. + { + throw new SerializationException(SR.Serialization_SurrogateCharacter); + } + } + /// /// Creates a object from raw data with validation. /// diff --git a/src/libraries/System.Formats.Nrbf/tests/InvalidInputTests.cs b/src/libraries/System.Formats.Nrbf/tests/InvalidInputTests.cs index b1625c7ca92870..81899523f7d9dc 100644 --- a/src/libraries/System.Formats.Nrbf/tests/InvalidInputTests.cs +++ b/src/libraries/System.Formats.Nrbf/tests/InvalidInputTests.cs @@ -564,8 +564,10 @@ public void InvalidDecimal(string textRepresentation) Assert.Throws(() => NrbfDecoder.Decode(stream)); } - [Fact] - public void SurrogateCharacter() + [Theory] + [InlineData(true)] + [InlineData(false)] + public void SurrogateCharacters(bool array) { using MemoryStream stream = new(); BinaryWriter writer = new(stream, Encoding.UTF8); @@ -576,8 +578,22 @@ public void SurrogateCharacter() writer.Write("ClassWithCharField"); // type name writer.Write(1); // member count writer.Write("memberName"); - writer.Write((byte)BinaryType.Primitive); - writer.Write((byte)PrimitiveType.Char); + + if (array) + { + writer.Write((byte)BinaryType.PrimitiveArray); + writer.Write((byte)PrimitiveType.Char); + writer.Write((byte)SerializationRecordType.ArraySinglePrimitive); + writer.Write(2); // array record Id + writer.Write(1); // array length + writer.Write((byte)PrimitiveType.Char); + } + else + { + writer.Write((byte)BinaryType.Primitive); + writer.Write((byte)PrimitiveType.Char); + } + writer.Write((byte)0xC0); // a surrogate character writer.Write((byte)SerializationRecordType.MessageEnd);