Skip to content
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.

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

Added missing length check that caused an ArgumentNullException (#750) #753

Merged
merged 4 commits into from
Oct 27, 2018
Merged
Show file tree
Hide file tree
Changes from 1 commit
Commits
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
5 changes: 5 additions & 0 deletions src/ImageSharp/Common/Extensions/EncoderExtensions.cs
Original file line number Diff line number Diff line change
Expand Up @@ -20,6 +20,11 @@ internal static unsafe class EncoderExtensions
/// <returns>The string.</returns>
public static string GetString(this Encoding encoding, ReadOnlySpan<byte> buffer)
{
if (buffer.Length == 0)
{
return null;
}

fixed (byte* bytes = buffer)
{
return encoding.GetString(bytes, buffer.Length);
Expand Down
32 changes: 32 additions & 0 deletions tests/ImageSharp.Tests/Common/EncoderExtensionsTests.cs
Original file line number Diff line number Diff line change
@@ -0,0 +1,32 @@
// Copyright (c) Six Labors and contributors.
// Licensed under the Apache License, Version 2.0.

using System;
using System.Text;
using Xunit;

namespace SixLabors.ImageSharp.Tests.Common
{
public class EncoderExtensionsTests
{
[Fact]
public void GetString_EmptyBuffer_ReturnsNull()
{
var buffer = new ReadOnlySpan<byte>();

string result = Encoding.UTF8.GetString(buffer);

Assert.Null(result);
}

[Fact]
public void GetString_Buffer_ReturnsString()
{
var buffer = new ReadOnlySpan<byte>(new byte[] { 73, 109, 97, 103, 101, 83, 104, 97, 114, 112 });

string result = Encoding.UTF8.GetString(buffer);

Assert.Equal("ImageSharp", result);
}
}
}