Merge pull request #2192 from smorokin/patch-1

Relaxed bmp dimensions validation

Author: JimBobSquarePants

src/ImageSharp/Formats/Bmp/BmpDecoderCore.cs

@@ -1471,8 +1471,6 @@ private int ReadImageHeaders(BufferedReadStream stream, out bool inverted, out b
                 }
             }
 
-            this.infoHeader.VerifyDimensions();
-
             int skipAmount = this.fileHeader.Offset - (int)this.stream.Position;
             if ((skipAmount + (int)this.stream.Position) > this.stream.Length)
             {

src/ImageSharp/Formats/Bmp/BmpInfoHeader.cs

@@ -542,17 +542,5 @@ public void WriteV5Header(Span<byte> buffer)
 
             dest = this;
         }
-
-        internal void VerifyDimensions()
-        {
-            const int MaximumBmpDimension = 65535;
-
-            if (this.Width > MaximumBmpDimension || this.Height > MaximumBmpDimension)
-            {
-                throw new InvalidOperationException(
-                    $"The input bmp '{this.Width}x{this.Height}' is "
-                    + $"bigger then the max allowed size '{MaximumBmpDimension}x{MaximumBmpDimension}'");
-            }
-        }
     }
 }

tests/ImageSharp.Tests/Formats/Bmp/BmpEncoderTests.cs

@@ -1,6 +1,7 @@
 // Copyright (c) Six Labors.
 // Licensed under the Six Labors Split License.
 
+using System;
 using System.IO;
 using SixLabors.ImageSharp.Formats;
 using SixLabors.ImageSharp.Formats.Bmp;
@@ -350,6 +351,21 @@ public void Encode_PreservesColorProfile<TPixel>(TestImageProvider<TPixel> provi
             Assert.Equal(expectedProfileBytes, actualProfileBytes);
         }
 
+        [Theory]
+        [InlineData(1, 66535)]
+        [InlineData(66535, 1)]
+        public void Encode_WorksWithSizeGreaterThen65k(int width, int height)
+        {
+            Exception exception = Record.Exception(() =>
+            {
+                using Image image = new Image<Rgba32>(width, height);
+                using var memStream = new MemoryStream();
+                image.Save(memStream, BmpEncoder);
+            });
+
+            Assert.Null(exception);
+        }
+
         [Theory]
         [WithFile(Car, PixelTypes.Rgba32, BmpBitsPerPixel.Pixel32)]
         [WithFile(V5Header, PixelTypes.Rgba32, BmpBitsPerPixel.Pixel32)]