Skip to content

Validate mimeType in ImageContentBlock.FromBytes and AudioContentBlock.FromBytes #1321

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
stephentoub merged 3 commits into from
Feb 20, 2026
+26 −2
Merged

Validate mimeType in ImageContentBlock.FromBytes and AudioContentBlock.FromBytes #1321

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
5c0b287
Initial plan
Copilot Feb 20, 2026
8135f12
Add mimeType validation to ImageContentBlock.FromBytes and AudioConte…
Copilot Feb 20, 2026
19f216c
Merge branch 'main' into copilot/fix-exception-for-null-mime-type
stephentoub Feb 20, 2026
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
10 changes: 8 additions & 2 deletions src/ModelContextProtocol.Core/Protocol/ContentBlock.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -391,9 +391,12 @@ public sealed class ImageContentBlock : ContentBlock
/// <remarks>
/// This method stores the provided bytes as <see cref="DecodedData"/> and encodes them to base64 UTF-8 bytes for <see cref="Data"/>.
/// </remarks>
/// <exception cref="InvalidOperationException"></exception>
/// <exception cref="ArgumentNullException"><paramref name="mimeType"/> is <see langword="null"/>.</exception>
/// <exception cref="ArgumentException"><paramref name="mimeType"/> is empty or composed entirely of whitespace.</exception>
public static ImageContentBlock FromBytes(ReadOnlyMemory<byte> bytes, string mimeType)
{
Throw.IfNullOrWhiteSpace(mimeType);

ReadOnlyMemory<byte> data = EncodingUtilities.EncodeToBase64Utf8(bytes);

return new()
Expand Down Expand Up @@ -476,9 +479,12 @@ public sealed class AudioContentBlock : ContentBlock
/// <remarks>
/// This method stores the provided bytes as <see cref="DecodedData"/> and encodes them to base64 UTF-8 bytes for <see cref="Data"/>.
/// </remarks>
/// <exception cref="InvalidOperationException"></exception>
/// <exception cref="ArgumentNullException"><paramref name="mimeType"/> is <see langword="null"/>.</exception>
/// <exception cref="ArgumentException"><paramref name="mimeType"/> is empty or composed entirely of whitespace.</exception>
public static AudioContentBlock FromBytes(ReadOnlyMemory<byte> bytes, string mimeType)
{
Throw.IfNullOrWhiteSpace(mimeType);

ReadOnlyMemory<byte> data = EncodingUtilities.EncodeToBase64Utf8(bytes);

return new()
Expand Down
18 changes: 18 additions & 0 deletions tests/ModelContextProtocol.Tests/Protocol/ContentBlockTests.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -225,4 +225,22 @@ public void ToolUseContentBlock_SerializationRoundTrip()
Assert.Equal("Paris", result.Input.GetProperty("city").GetString());
Assert.Equal("metric", result.Input.GetProperty("units").GetString());
}

[Theory]
[InlineData(null)]
[InlineData("")]
[InlineData(" ")]
public void ImageContentBlock_FromBytes_ThrowsForNullOrWhiteSpaceMimeType(string? mimeType)
{
Assert.ThrowsAny<ArgumentException>(() => ImageContentBlock.FromBytes((byte[])[1, 2, 3], mimeType!));
}

[Theory]
[InlineData(null)]
[InlineData("")]
[InlineData(" ")]
public void AudioContentBlock_FromBytes_ThrowsForNullOrWhiteSpaceMimeType(string? mimeType)
{
Assert.ThrowsAny<ArgumentException>(() => AudioContentBlock.FromBytes((byte[])[1, 2, 3], mimeType!));
}
}