From ea0126f3c8f86c50f3a6f3dfe2751d7c8def4a93 Mon Sep 17 00:00:00 2001
From: Scott Williams <tocsoft@gmail.com>
Date: Thu, 19 Jan 2017 20:21:51 +0000
Subject: [PATCH] stop processing jpeg file once image loaded.

---
 .../Components/Decoder/JpegScanDecoder.cs     |   5 ++-
 .../JpegDecoderCore.cs                        |  15 ++++++-
 .../Formats/Jpg/BadEofJpegTests.cs            |  38 ++++++++++++++++++
 tests/ImageSharp.Tests/TestImages.cs          |   1 +
 .../TestImages/Formats/Jpg/badeof.jpg         | Bin 0 -> 5770 bytes
 5 files changed, 56 insertions(+), 3 deletions(-)
 create mode 100644 tests/ImageSharp.Tests/Formats/Jpg/BadEofJpegTests.cs
 create mode 100644 tests/ImageSharp.Tests/TestImages/Formats/Jpg/badeof.jpg

diff --git a/src/ImageSharp.Formats.Jpeg/Components/Decoder/JpegScanDecoder.cs b/src/ImageSharp.Formats.Jpeg/Components/Decoder/JpegScanDecoder.cs
index 39ee6687b..329c58951 100644
--- a/src/ImageSharp.Formats.Jpeg/Components/Decoder/JpegScanDecoder.cs
+++ b/src/ImageSharp.Formats.Jpeg/Components/Decoder/JpegScanDecoder.cs
@@ -118,7 +118,8 @@ namespace ImageSharp.Formats.Jpg
         /// Reads the blocks from the <see cref="JpegDecoderCore"/>-s stream, and processes them into the corresponding <see cref="JpegPixelArea"/> instances.
         /// </summary>
         /// <param name="decoder">The <see cref="JpegDecoderCore"/> instance</param>
-        public void ProcessBlocks(JpegDecoderCore decoder)
+        /// <returns>MCUs processed</returns>
+        public int ProcessBlocks(JpegDecoderCore decoder)
         {
             int blockCount = 0;
             int mcu = 0;
@@ -229,6 +230,8 @@ namespace ImageSharp.Formats.Jpg
 
                 // for mx
             }
+
+            return mcu;
         }
 
         private void ResetDc()
diff --git a/src/ImageSharp.Formats.Jpeg/JpegDecoderCore.cs b/src/ImageSharp.Formats.Jpeg/JpegDecoderCore.cs
index 3edd6f70e..5ab5764e2 100644
--- a/src/ImageSharp.Formats.Jpeg/JpegDecoderCore.cs
+++ b/src/ImageSharp.Formats.Jpeg/JpegDecoderCore.cs
@@ -79,6 +79,16 @@ namespace ImageSharp.Formats
         /// </summary>
         private YCbCrImage ycbcrImage;
 
+        /// <summary>
+        /// The MCU target
+        /// </summary>
+        private int mcuTarget;
+
+        /// <summary>
+        /// The MCUs processed
+        /// </summary>
+        private int mcusProcessed;
+
         /// <summary>
         /// Initializes a new instance of the <see cref="JpegDecoderCore" /> class.
         /// </summary>
@@ -187,7 +197,7 @@ namespace ImageSharp.Formats
             }
 
             // Process the remaining segments until the End Of Image marker.
-            while (true)
+            while (this.mcuTarget < 1 || this.mcuTarget != this.mcusProcessed)
             {
                 this.ReadFull(this.Temp, 0, 2);
                 while (this.Temp[0] != 0xff)
@@ -864,6 +874,7 @@ namespace ImageSharp.Formats
         /// <param name="myy">The vertical MCU count</param>
         private void MakeImage(int mxx, int myy)
         {
+            this.mcuTarget = mxx * myy;
             if (this.grayImage.IsInitialized || this.ycbcrImage != null)
             {
                 return;
@@ -1395,7 +1406,7 @@ namespace ImageSharp.Formats
             JpegScanDecoder.Init(&scan, this, remaining);
             this.Bits = default(Bits);
             this.MakeImage(scan.XNumberOfMCUs, scan.YNumberOfMCUs);
-            scan.ProcessBlocks(this);
+            this.mcusProcessed += scan.ProcessBlocks(this);
         }
 
         /// <summary>
diff --git a/tests/ImageSharp.Tests/Formats/Jpg/BadEofJpegTests.cs b/tests/ImageSharp.Tests/Formats/Jpg/BadEofJpegTests.cs
new file mode 100644
index 000000000..0697dbb64
--- /dev/null
+++ b/tests/ImageSharp.Tests/Formats/Jpg/BadEofJpegTests.cs
@@ -0,0 +1,38 @@
+// <copyright file="JpegTests.cs" company="James Jackson-South">
+// Copyright (c) James Jackson-South and contributors.
+// Licensed under the Apache License, Version 2.0.
+// </copyright>
+
+using System;
+using System.Collections.Generic;
+using System.IO;
+using System.Linq;
+using ImageSharp.Formats;
+using Xunit;
+using Xunit.Abstractions;
+// ReSharper disable InconsistentNaming
+
+namespace ImageSharp.Tests
+{
+    using System.Numerics;
+
+    using ImageSharp.Formats.Jpg;
+    using ImageSharp.Processing;
+
+    public class BadEOFJpegTests : MeasureFixture
+    {
+        public BadEOFJpegTests(ITestOutputHelper output)
+            : base(output)
+        {
+        }
+
+        [Theory]
+        [WithFile(TestImages.Jpeg.BadEOF, PixelTypes.Color)]
+        public void LoadImage<TColor>(TestImageProvider<TColor> provider)
+            where TColor : struct, IPackedPixel, IEquatable<TColor>
+        {
+            var image = provider.GetImage();
+            Assert.NotNull(image);
+        }
+    }
+}
\ No newline at end of file
diff --git a/tests/ImageSharp.Tests/TestImages.cs b/tests/ImageSharp.Tests/TestImages.cs
index 89b3c0f0d..9e2d21a9b 100644
--- a/tests/ImageSharp.Tests/TestImages.cs
+++ b/tests/ImageSharp.Tests/TestImages.cs
@@ -51,6 +51,7 @@ namespace ImageSharp.Tests
             public const string Festzug = "Jpg/Festzug.jpg";
             public const string Hiyamugi = "Jpg/Hiyamugi.jpg";
 
+            public const string BadEOF = "Jpg/badeof.jpg";
             public const string Snake = "Jpg/Snake.jpg";
             public const string Lake = "Jpg/Lake.jpg";
 
diff --git a/tests/ImageSharp.Tests/TestImages/Formats/Jpg/badeof.jpg b/tests/ImageSharp.Tests/TestImages/Formats/Jpg/badeof.jpg
new file mode 100644
index 0000000000000000000000000000000000000000..1ba3418deece20bf0d1de2a4177d743795c094ab
GIT binary patch
literal 5770
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

literal 0
HcmV?d00001