RavenDB-23220 - null check before materializing to string

ravendb · Jan 8, 2025 · e2786df · e2786df
1 parent aedbe17
commit e2786df
Showing 1 changed file with 4 additions and 1 deletion.
diff --git a/src/Lucene.Net/Util/UnmanagedStringArray.cs b/src/Lucene.Net/Util/UnmanagedStringArray.cs
@@ -89,14 +89,17 @@ public struct UnmanagedString : IComparable
         {
             public byte* Start;
 
-            public int Size => IsNull ? 0 : (*(int*)Start >> 1);
+            public int Size => *(int*)Start >> 1;
             public bool StoredAsAscii => (*(int*)Start & 1) == 1;
             public Span<byte> StringAsBytes => new Span<byte>(Start + sizeof(int), Size);
             public Span<char> StringAsChars => new Span<char>(Start + sizeof(int), Size);
             public bool IsNull => Start == default;
 
             public override string ToString()
             {
+                if (IsNull)
+                    return string.Empty;
+
                 return StoredAsAscii ? Encoding.UTF8.GetString(StringAsBytes) : new string(StringAsChars);
             }