Merge pull request #753 from SixLabors/dl/fix-750

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

src/ImageSharp/Common/Extensions/EncoderExtensions.cs

@@ -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 string.Empty;
+            }
+
             fixed (byte* bytes = buffer)
             {
                 return encoding.GetString(bytes, buffer.Length);

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_ReturnsEmptyString()
+        {
+            var buffer = new ReadOnlySpan<byte>();
+
+            string result = Encoding.UTF8.GetString(buffer);
+
+            Assert.Equal(string.Empty, 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);
+        }
+    }
+}

tests/ImageSharp.Tests/Formats/Jpg/JpegDecoderTests.Images.cs

@@ -26,7 +26,9 @@ public partial class JpegDecoderTests
                 TestImages.Jpeg.Issues.ExifDecodeOutOfRange694,
                 TestImages.Jpeg.Issues.InvalidEOI695,
                 TestImages.Jpeg.Issues.ExifResizeOutOfRange696,
-                TestImages.Jpeg.Issues.InvalidAPP0721
+                TestImages.Jpeg.Issues.InvalidAPP0721,
+                TestImages.Jpeg.Issues.ExifGetString750Load,
+                TestImages.Jpeg.Issues.ExifGetString750Transform
             };
 
         public static string[] ProgressiveTestJpegs =

tests/ImageSharp.Tests/TestImages.cs

@@ -160,6 +160,8 @@ public static class Issues
                 public const string OrderedInterleavedProgressive723A = "Jpg/issues/Issue723-Ordered-Interleaved-Progressive-A.jpg";
                 public const string OrderedInterleavedProgressive723B = "Jpg/issues/Issue723-Ordered-Interleaved-Progressive-B.jpg";
                 public const string OrderedInterleavedProgressive723C = "Jpg/issues/Issue723-Ordered-Interleaved-Progressive-C.jpg";
+                public const string ExifGetString750Transform = "Jpg/issues/issue750-exif-tranform.jpg";
+                public const string ExifGetString750Load = "Jpg/issues/issue750-exif-load.jpg";
             }
 
             public static readonly string[] All = Baseline.All.Concat(Progressive.All).ToArray();