Oops, fixed a bug in reading strings that contain null terminators.

Author: MeltyPlayer

Schema Tests/binary/reader/StringAsciiTests.cs

@@ -35,6 +35,19 @@ public void TestString(string str) {
     Assert.AreEqual(str.Length, ms.Position);
   }
 
+  [Test]
+  [TestCase("foobar\0e", ExpectedResult = "foobar")]
+  public string TestStringWithNullTerminator(string str) {
+    using var ms = new MemoryStream();
+    using var sw = new StreamWriter(ms);
+    sw.Write(str);
+    sw.Flush();
+    ms.Position = 0;
+
+    using var br = new SchemaBinaryReader(ms);
+    return br.ReadString(str.Length);
+  }
+
   [Test]
   public void TestReadNT() {
     var str = "string 1\0string 2\0string 3";

Schema/Schema.csproj

@@ -14,7 +14,7 @@
     <Description>Library for converting classes to and from binary. Provides a C# Roslyn generator that automatically implements conversion logic for simple classes.</Description>
     <PackageId>schema</PackageId>
     <Title>schema</Title>
-    <Version>0.6.18</Version>
+    <Version>0.6.19</Version>
     <Authors>MeltyPlayer</Authors>
   </PropertyGroup>
 

Schema/src/binary/reader/SchemaBinaryReader_Strings.cs

@@ -4,6 +4,7 @@
 
 using schema.binary.attributes;
 using schema.text.reader;
+using schema.util.strings;
 
 
 namespace schema.binary;
@@ -263,7 +264,7 @@ public string ReadLine(Encoding encoding)
   [MethodImpl(MethodImplOptions.AggressiveInlining)]
   public void AssertString(string expectedValue)
     => SchemaBinaryReader.AssertStrings_(
-        expectedValue.AsSpan().TrimEnd('\0'),
+        expectedValue.TrimNt(),
         this.ReadString(expectedValue.Length).AsSpan());
 
   [MethodImpl(MethodImplOptions.AggressiveInlining)]
@@ -275,14 +276,14 @@ public void AssertString(StringEncodingType encodingType,
   [MethodImpl(MethodImplOptions.AggressiveInlining)]
   public void AssertString(Encoding encoding, string expectedValue)
     => SchemaBinaryReader.AssertStrings_(
-        expectedValue.AsSpan().TrimEnd('\0'),
+        expectedValue.TrimNt(),
         this.ReadString(encoding, expectedValue.Length).AsSpan());
 
   [MethodImpl(MethodImplOptions.AggressiveInlining)]
   public string ReadString(long count) {
     Span<char> buffer = stackalloc char[(int) count];
     this.ReadChars(buffer);
-    return ((ReadOnlySpan<char>) buffer).TrimEnd('\0').ToString();
+    return buffer.TrimNt().ToString();
   }
 
   [MethodImpl(MethodImplOptions.AggressiveInlining)]
@@ -293,7 +294,7 @@ public string ReadString(StringEncodingType encodingType, long count)
   public string ReadString(Encoding encoding, long count) {
     Span<char> buffer = stackalloc char[(int) count];
     this.ReadChars(encoding, buffer);
-    return ((ReadOnlySpan<char>) buffer).TrimEnd('\0').ToString();
+    return buffer.TrimNt().ToString();
   }
 
 

Schema/src/util/strings/StringExtensions.cs

@@ -7,6 +7,11 @@
 namespace schema.util.strings;
 
 public static class StringExtensions {
+  public static ReadOnlySpan<char> TrimNt(this ReadOnlySpan<char> text) {
+    var ntIndex = text.IndexOf('\0');
+    return ntIndex != -1 ? text.Slice(0, ntIndex) : text;
+  }
+
   public static int IndexOfFirst(
       this string text,
       ReadOnlySpan<char> chars,