From d1c6e5042900dbbe8668e82e3213764453506b76 Mon Sep 17 00:00:00 2001
From: Dmitry Pentin <riotbr3aker@gmail.com>
Date: Fri, 15 Apr 2022 12:08:58 +0300
Subject: [PATCH] Added test image

---
 .../Formats/Jpg/JpegDecoderTests.Images.cs    |  1 +
 .../Formats/Jpg/JpegEncoderTests.Metadata.cs  | 33 +++++++++++++++++++
 .../Formats/Jpg/JpegEncoderTests.cs           |  2 +-
 tests/ImageSharp.Tests/TestImages.cs          |  1 +
 ...ssue2087-exif-null-reference-on-encode.jpg |  3 ++
 5 files changed, 39 insertions(+), 1 deletion(-)
 create mode 100644 tests/ImageSharp.Tests/Formats/Jpg/JpegEncoderTests.Metadata.cs
 create mode 100644 tests/Images/Input/Jpg/issues/Issue2087-exif-null-reference-on-encode.jpg

diff --git a/tests/ImageSharp.Tests/Formats/Jpg/JpegDecoderTests.Images.cs b/tests/ImageSharp.Tests/Formats/Jpg/JpegDecoderTests.Images.cs
index 70cbc3af72..60439bc3d7 100644
--- a/tests/ImageSharp.Tests/Formats/Jpg/JpegDecoderTests.Images.cs
+++ b/tests/ImageSharp.Tests/Formats/Jpg/JpegDecoderTests.Images.cs
@@ -33,6 +33,7 @@ namespace SixLabors.ImageSharp.Tests.Formats.Jpg
             TestImages.Jpeg.Issues.ExifGetString750Load,
             TestImages.Jpeg.Issues.ExifGetString750Transform,
             TestImages.Jpeg.Issues.BadSubSampling1076,
+            TestImages.Jpeg.Issues.ValidExifArgumentNullExceptionOnEncode,
 
             // LibJpeg can open this despite the invalid density units.
             TestImages.Jpeg.Issues.Fuzz.ArgumentOutOfRangeException825B,
diff --git a/tests/ImageSharp.Tests/Formats/Jpg/JpegEncoderTests.Metadata.cs b/tests/ImageSharp.Tests/Formats/Jpg/JpegEncoderTests.Metadata.cs
new file mode 100644
index 0000000000..46ac23be12
--- /dev/null
+++ b/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 exception = Record.Exception(() =>
+            {
+                var encoder = new JpegEncoder();
+                var stream = new MemoryStream();
+
+                using Image<TPixel> image = provider.GetImage(JpegDecoder);
+                image.Save(stream, encoder);
+            });
+
+            Assert.Null(exception);
+        }
+    }
+}
diff --git a/tests/ImageSharp.Tests/Formats/Jpg/JpegEncoderTests.cs b/tests/ImageSharp.Tests/Formats/Jpg/JpegEncoderTests.cs
index 18eae9fbd3..d860836e08 100644
--- a/tests/ImageSharp.Tests/Formats/Jpg/JpegEncoderTests.cs
+++ b/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();
 
diff --git a/tests/ImageSharp.Tests/TestImages.cs b/tests/ImageSharp.Tests/TestImages.cs
index 07aff6fc12..4ea740266a 100644
--- a/tests/ImageSharp.Tests/TestImages.cs
+++ b/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
                 {
diff --git a/tests/Images/Input/Jpg/issues/Issue2087-exif-null-reference-on-encode.jpg b/tests/Images/Input/Jpg/issues/Issue2087-exif-null-reference-on-encode.jpg
new file mode 100644
index 0000000000..e95ef7a73d
--- /dev/null
+++ b/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