From b789db0ba62529c7e623a06a9baf99bf8de99534 Mon Sep 17 00:00:00 2001
From: Dirk Lemstra <dirk@lemstra.org>
Date: Fri, 26 Oct 2018 22:58:35 +0200
Subject: [PATCH] Added missing length check that caused an
 ArgumentNullException (#750)

---
 .../Common/Extensions/EncoderExtensions.cs    |  5 +++
 .../Common/EncoderExtensionsTests.cs          | 32 +++++++++++++++++++
 2 files changed, 37 insertions(+)
 create mode 100644 tests/ImageSharp.Tests/Common/EncoderExtensionsTests.cs

diff --git a/src/ImageSharp/Common/Extensions/EncoderExtensions.cs b/src/ImageSharp/Common/Extensions/EncoderExtensions.cs
index 82899863c..086dbee35 100644
--- a/src/ImageSharp/Common/Extensions/EncoderExtensions.cs
+++ b/src/ImageSharp/Common/Extensions/EncoderExtensions.cs
@@ -20,6 +20,11 @@ namespace SixLabors.ImageSharp
         /// <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);
diff --git a/tests/ImageSharp.Tests/Common/EncoderExtensionsTests.cs b/tests/ImageSharp.Tests/Common/EncoderExtensionsTests.cs
new file mode 100644
index 000000000..ec1ae65d6
--- /dev/null
+++ b/tests/ImageSharp.Tests/Common/EncoderExtensionsTests.cs
@@ -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);
+        }
+    }
+}