Use Base64.DecodeFromUtf8 to avoid string intermediate during decoding

Co-authored-by: ericstj <[email protected]>

Author: 2 people

src/ModelContextProtocol.Core/Protocol/BlobResourceContents.cs

@@ -1,3 +1,4 @@
+using System.Buffers.Text;
 using System.Diagnostics;
 using System.Runtime.InteropServices;
 using System.Text.Json.Serialization;
@@ -60,7 +61,17 @@ public ReadOnlyMemory<byte> Data
             if (_decodedData is null)
             {
 #if NET
-                _decodedData = Convert.FromBase64String(System.Text.Encoding.UTF8.GetString(Blob.Span));
+                // Decode directly from UTF-8 base64 bytes without string intermediate
+                int maxLength = Base64.GetMaxDecodedFromUtf8Length(Blob.Length);
+                byte[] buffer = new byte[maxLength];
+                if (Base64.DecodeFromUtf8(Blob.Span, buffer, out _, out int bytesWritten) == System.Buffers.OperationStatus.Done)
+                {
+                    _decodedData = bytesWritten == maxLength ? buffer : buffer.AsMemory(0, bytesWritten).ToArray();
+                }
+                else
+                {
+                    throw new FormatException("Invalid base64 data");
+                }
 #else
                 byte[] array = MemoryMarshal.TryGetArray(Blob, out ArraySegment<byte> segment) && segment.Offset == 0 && segment.Count == segment.Array!.Length ? segment.Array : Blob.ToArray();
                 _decodedData = Convert.FromBase64String(System.Text.Encoding.UTF8.GetString(array));

src/ModelContextProtocol.Core/Protocol/ContentBlock.cs

@@ -1,4 +1,5 @@
 using System.Buffers;
+using System.Buffers.Text;
 using System.ComponentModel;
 using System.Diagnostics;
 using System.Diagnostics.CodeAnalysis;
@@ -426,7 +427,17 @@ public ReadOnlyMemory<byte> DecodedData
             if (_decodedData is null)
             {
 #if NET
-                _decodedData = Convert.FromBase64String(System.Text.Encoding.UTF8.GetString(Data.Span));
+                // Decode directly from UTF-8 base64 bytes without string intermediate
+                int maxLength = Base64.GetMaxDecodedFromUtf8Length(Data.Length);
+                byte[] buffer = new byte[maxLength];
+                if (Base64.DecodeFromUtf8(Data.Span, buffer, out _, out int bytesWritten) == System.Buffers.OperationStatus.Done)
+                {
+                    _decodedData = bytesWritten == maxLength ? buffer : buffer.AsMemory(0, bytesWritten).ToArray();
+                }
+                else
+                {
+                    throw new FormatException("Invalid base64 data");
+                }
 #else
                 byte[] array = MemoryMarshal.TryGetArray(Data, out ArraySegment<byte> segment) && segment.Offset == 0 && segment.Count == segment.Array!.Length ? segment.Array : Data.ToArray();
                 _decodedData = Convert.FromBase64String(System.Text.Encoding.UTF8.GetString(array));
@@ -491,7 +502,17 @@ public ReadOnlyMemory<byte> DecodedData
             if (_decodedData is null)
             {
 #if NET
-                _decodedData = Convert.FromBase64String(System.Text.Encoding.UTF8.GetString(Data.Span));
+                // Decode directly from UTF-8 base64 bytes without string intermediate
+                int maxLength = Base64.GetMaxDecodedFromUtf8Length(Data.Length);
+                byte[] buffer = new byte[maxLength];
+                if (Base64.DecodeFromUtf8(Data.Span, buffer, out _, out int bytesWritten) == System.Buffers.OperationStatus.Done)
+                {
+                    _decodedData = bytesWritten == maxLength ? buffer : buffer.AsMemory(0, bytesWritten).ToArray();
+                }
+                else
+                {
+                    throw new FormatException("Invalid base64 data");
+                }
 #else
                 byte[] array = MemoryMarshal.TryGetArray(Data, out ArraySegment<byte> segment) && segment.Offset == 0 && segment.Count == segment.Array!.Length ? segment.Array : Data.ToArray();
                 _decodedData = Convert.FromBase64String(System.Text.Encoding.UTF8.GetString(array));