Merge branch 'main' into js/decode-sanitation

src/ImageSharp/Metadata/Profiles/Exif/ExifEncodedStringHelpers.cs

@@ -80,7 +80,15 @@ namespace SixLabors.ImageSharp.Metadata.Profiles.Exif
         }
 
         public static unsafe int Write(Encoding encoding, string value, Span<byte> destination)
+#if NETSTANDARD2_1_OR_GREATER || NETCOREAPP2_1_OR_GREATER || NET
+            => encoding.GetBytes(value.AsSpan(), destination);
+#else
         {
+            if (value.Length == 0)
+            {
+                return 0;
+            }
+
             fixed (char* c = value)
             {
                 fixed (byte* b = destination)
@@ -89,6 +97,7 @@ namespace SixLabors.ImageSharp.Metadata.Profiles.Exif
                 }
             }
         }
+#endif
 
         private static bool TryDetect(ReadOnlySpan<byte> buffer, out CharacterCode code)
         {

tests/ImageSharp.Tests/Formats/Jpg/JpegEncoderTests.Metadata.cs

@@ -0,0 +1,33 @@
+// Copyright (c) Six Labors.
+// Licensed under the Apache License, Version 2.0.
+
+using System;
+using System.IO;
+using SixLabors.ImageSharp.Formats.Jpeg;
+using SixLabors.ImageSharp.PixelFormats;
+
+using Xunit;
+
+namespace SixLabors.ImageSharp.Tests.Formats.Jpg
+{
+    [Trait("Format", "Jpg")]
+    public partial class JpegEncoderTests
+    {
+        [Theory]
+        [WithFile(TestImages.Jpeg.Issues.ValidExifArgumentNullExceptionOnEncode, PixelTypes.Rgba32)]
+        public void Encode_WithValidExifProfile_DoesNotThrowException<TPixel>(TestImageProvider<TPixel> provider)
+            where TPixel : unmanaged, IPixel<TPixel>
+        {
+            Exception ex = Record.Exception(() =>
+            {
+                var encoder = new JpegEncoder();
+                var stream = new MemoryStream();
+
+                using Image<TPixel> image = provider.GetImage(JpegDecoder);
+                image.Save(stream, encoder);
+            });
+
+            Assert.Null(ex);
+        }
+    }
+}

tests/ImageSharp.Tests/Formats/Jpg/JpegEncoderTests.cs

@@ -20,7 +20,7 @@ using Xunit;
 namespace SixLabors.ImageSharp.Tests.Formats.Jpg
 {
     [Trait("Format", "Jpg")]
-    public class JpegEncoderTests
+    public partial class JpegEncoderTests
     {
         private static JpegEncoder JpegEncoder => new();
 

tests/ImageSharp.Tests/TestImages.cs

@@ -264,6 +264,7 @@ namespace SixLabors.ImageSharp.Tests
                 public const string InvalidIptcTag = "Jpg/issues/Issue1942InvalidIptcTag.jpg";
                 public const string Issue2057App1Parsing = "Jpg/issues/Issue2057-App1Parsing.jpg";
                 public const string ExifNullArrayTag = "Jpg/issues/issue-2056-exif-null-array.jpg";
+                public const string ValidExifArgumentNullExceptionOnEncode = "Jpg/issues/Issue2087-exif-null-reference-on-encode.jpg";
 
                 public static class Fuzz
                 {

tests/Images/Input/Jpg/issues/Issue2087-exif-null-reference-on-encode.jpg

@@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:4d41a41180a3371d0c4a724b40a4c86f6f975dab6be9da96964a484818770394
+size 30715