From 3e7b84054d7f7878b6eab939e0dbf0b48b66d3f3 Mon Sep 17 00:00:00 2001
From: James Jackson-South <james_south@hotmail.com>
Date: Fri, 24 Aug 2018 19:41:33 +0100
Subject: [PATCH 1/2] Don't allow duplicate formats in configuration.

---
 src/ImageSharp/Formats/ImageFormatManager.cs | 17 +++++++++++++++--
 tests/ImageSharp.Tests/ConfigurationTests.cs | 14 +++++++++-----
 2 files changed, 24 insertions(+), 7 deletions(-)

diff --git a/src/ImageSharp/Formats/ImageFormatManager.cs b/src/ImageSharp/Formats/ImageFormatManager.cs
index 63fd02d8d..fdbc4ee44 100644
--- a/src/ImageSharp/Formats/ImageFormatManager.cs
+++ b/src/ImageSharp/Formats/ImageFormatManager.cs
@@ -13,6 +13,12 @@ namespace SixLabors.ImageSharp.Formats
     /// </summary>
     public class ImageFormatManager
     {
+        /// <summary>
+        /// Used for locking against as there is no ConcurrentSet type.
+        /// <see href="https://github.com/dotnet/corefx/issues/6318"/>
+        /// </summary>
+        private static readonly object HashLock = new object();
+
         /// <summary>
         /// The list of supported <see cref="IImageEncoder"/> keyed to mime types.
         /// </summary>
@@ -26,7 +32,7 @@ namespace SixLabors.ImageSharp.Formats
         /// <summary>
         /// The list of supported <see cref="IImageFormat"/>s.
         /// </summary>
-        private readonly ConcurrentBag<IImageFormat> imageFormats = new ConcurrentBag<IImageFormat>();
+        private readonly HashSet<IImageFormat> imageFormats = new HashSet<IImageFormat>();
 
         /// <summary>
         /// The list of supported <see cref="IImageFormatDetector"/>s.
@@ -74,7 +80,14 @@ namespace SixLabors.ImageSharp.Formats
             Guard.NotNull(format, nameof(format));
             Guard.NotNull(format.MimeTypes, nameof(format.MimeTypes));
             Guard.NotNull(format.FileExtensions, nameof(format.FileExtensions));
-            this.imageFormats.Add(format);
+
+            lock (HashLock)
+            {
+                if (!this.imageFormats.Contains(format))
+                {
+                    this.imageFormats.Add(format);
+                }
+            }
         }
 
         /// <summary>
diff --git a/tests/ImageSharp.Tests/ConfigurationTests.cs b/tests/ImageSharp.Tests/ConfigurationTests.cs
index 1a7183df8..5c5eb9e9d 100644
--- a/tests/ImageSharp.Tests/ConfigurationTests.cs
+++ b/tests/ImageSharp.Tests/ConfigurationTests.cs
@@ -2,13 +2,9 @@
 // Licensed under the Apache License, Version 2.0.
 
 using System;
-using System.Collections.Generic;
-using System.IO;
 using System.Linq;
-using SixLabors.ImageSharp.Formats;
-using SixLabors.ImageSharp.IO;
-using SixLabors.ImageSharp.PixelFormats;
 using Moq;
+using SixLabors.ImageSharp.IO;
 using Xunit;
 // ReSharper disable InconsistentNaming
 
@@ -96,5 +92,13 @@ namespace SixLabors.ImageSharp.Tests
 
             provider.Verify(x => x.Configure(config));
         }
+
+        [Fact]
+        public void DefaultConfigurationHasCorrectFormatCount()
+        {
+            Configuration config = Configuration.Default;
+
+            Assert.Equal(4, config.ImageFormats.Count());
+        }
     }
 }
\ No newline at end of file

From 970b1ba25a4657db25ee2228f6b69c2f7001a00e Mon Sep 17 00:00:00 2001
From: James Jackson-South <james_south@hotmail.com>
Date: Fri, 24 Aug 2018 22:54:31 +0100
Subject: [PATCH 2/2] Add additional tests

---
 src/ImageSharp/Formats/ImageFormatManager.cs |  6 +++---
 tests/ImageSharp.Tests/ConfigurationTests.cs | 17 +++++++++++++++--
 2 files changed, 18 insertions(+), 5 deletions(-)

diff --git a/src/ImageSharp/Formats/ImageFormatManager.cs b/src/ImageSharp/Formats/ImageFormatManager.cs
index fdbc4ee44..e62805d47 100644
--- a/src/ImageSharp/Formats/ImageFormatManager.cs
+++ b/src/ImageSharp/Formats/ImageFormatManager.cs
@@ -99,9 +99,9 @@ namespace SixLabors.ImageSharp.Formats
         {
             Guard.NotNullOrWhiteSpace(extension, nameof(extension));
 
-            if (extension[0] == '.')
-            {
-                extension = extension.Substring(1);
+            if (extension[0] == '.')
+            {
+                extension = extension.Substring(1);
             }
 
             return this.imageFormats.FirstOrDefault(x => x.FileExtensions.Contains(extension, StringComparer.OrdinalIgnoreCase));
diff --git a/tests/ImageSharp.Tests/ConfigurationTests.cs b/tests/ImageSharp.Tests/ConfigurationTests.cs
index 5c5eb9e9d..4bec25f7a 100644
--- a/tests/ImageSharp.Tests/ConfigurationTests.cs
+++ b/tests/ImageSharp.Tests/ConfigurationTests.cs
@@ -15,8 +15,8 @@ namespace SixLabors.ImageSharp.Tests
     /// </summary>
     public class ConfigurationTests
     {
-        public Configuration ConfigurationEmpty { get; private set; }
-        public Configuration DefaultConfiguration { get; private set; }
+        public Configuration ConfigurationEmpty { get; }
+        public Configuration DefaultConfiguration { get; }
 
         public ConfigurationTests()
         {
@@ -93,6 +93,19 @@ namespace SixLabors.ImageSharp.Tests
             provider.Verify(x => x.Configure(config));
         }
 
+        [Fact]
+        public void ConfigurationCannotAddDuplicates()
+        {
+            const int count = 4;
+            Configuration config = Configuration.Default;
+
+            Assert.Equal(count, config.ImageFormats.Count());
+
+            config.ImageFormatsManager.AddImageFormat(ImageFormats.Bmp);
+
+            Assert.Equal(count, config.ImageFormats.Count());
+        }
+
         [Fact]
         public void DefaultConfigurationHasCorrectFormatCount()
         {