BinaryData.Empty.ToString throws ArgumentNullException (#68349)

* BinaryData.Empty.ToString throws ArgumentNullException * Update src/libraries/System.Memory.Data/src/System/BinaryData.cs Co-authored-by: Jan Kotas <jkotas@microsoft.com>
dotnet · Apr 22, 2022 · a685d88 · a685d88
1 parent 7810536
commit a685d88
Show file tree

Hide file tree

Showing 2 changed files with 12 additions and 0 deletions.
diff --git a/src/libraries/System.Memory.Data/src/System/BinaryData.cs b/src/libraries/System.Memory.Data/src/System/BinaryData.cs
@@ -205,6 +205,12 @@ public static BinaryData FromObjectAsJson<T>(T jsonSerializable, JsonSerializerO
  public override unsafe string ToString()
  {
  ReadOnlySpan<byte> span = _bytes.Span;
+
+ if (span.IsEmpty)
+ {
+ return string.Empty;
+ }
+
  fixed (byte* ptr = span)
  {
  return Encoding.UTF8.GetString(ptr, span.Length);

diff --git a/src/libraries/System.Memory.Data/tests/BinaryDataTests.cs b/src/libraries/System.Memory.Data/tests/BinaryDataTests.cs
@@ -585,6 +585,12 @@ public void EmptyIsSingleton()
  Assert.Same(BinaryData.Empty, BinaryData.Empty);
  }
 
+ [Fact]
+ public void ToStringReturnEmptyStringWhenBinaryDataEmpty()
+ {
+ Assert.Equal(string.Empty, BinaryData.Empty.ToString());
+ }
+
  private class TestModel
  {
  public string A { get; set; }