Merge pull request #2245 from SixLabors/bp/Issue2243

Webp: Ignore unknown chunks, fixes #2243
SixLabors · Sep 28, 2022 · 38348f2 · 38348f2
2 parents e7f701e + 770a850
commit 38348f2
Show file tree

Hide file tree

Showing 4 changed files with 18 additions and 1 deletion.
diff --git a/src/ImageSharp/Formats/Webp/WebpDecoderCore.cs b/src/ImageSharp/Formats/Webp/WebpDecoderCore.cs
@@ -221,7 +221,9 @@ private WebpImageInfo ReadVp8Info(bool ignoreAlpha = false)
                     }
                     else
                     {
-                        WebpThrowHelper.ThrowImageFormatException("Unexpected chunk followed VP8X header");
+                        // Ignore unknown chunks.
+                        uint chunkSize = this.ReadChunkSize();
+                        this.currentStream.Skip((int)chunkSize);
                     }
                 }
 

diff --git a/tests/ImageSharp.Tests/Formats/WebP/WebpDecoderTests.cs b/tests/ImageSharp.Tests/Formats/WebP/WebpDecoderTests.cs
@@ -385,6 +385,17 @@ public void WebpDecoder_CanDecode_Issue1594<TPixel>(TestImageProvider<TPixel> pr
         image.CompareToOriginal(provider, ReferenceDecoder);
     }
 
+    // https://github.com/SixLabors/ImageSharp/issues/2243
+    [Theory]
+    [WithFile(Lossy.Issue2243, PixelTypes.Rgba32)]
+    public void WebpDecoder_CanDecode_Issue2243<TPixel>(TestImageProvider<TPixel> provider)
+        where TPixel : unmanaged, IPixel<TPixel>
+    {
+        using Image<TPixel> image = provider.GetImage(WebpDecoder);
+        image.DebugSave(provider);
+        image.CompareToOriginal(provider, ReferenceDecoder);
+    }
+
     [Theory]
     [WithFile(Lossless.LossLessCorruptImage3, PixelTypes.Rgba32)]
     public void WebpDecoder_ThrowImageFormatException_OnInvalidImages<TPixel>(TestImageProvider<TPixel> provider)

diff --git a/tests/ImageSharp.Tests/TestImages.cs b/tests/ImageSharp.Tests/TestImages.cs
@@ -736,6 +736,7 @@ public static class Lossy
 
             // Issues
             public const string Issue1594 = "Webp/issues/Issue1594.webp";
+            public const string Issue2243 = "Webp/issues/Issue2243.webp";
         }
     }
 

diff --git a/tests/Images/Input/Webp/issues/Issue2243.webp b/tests/Images/Input/Webp/issues/Issue2243.webp
-Original file line number
+Diff line change
@@ Expand Up / @@ -736,6 +736,7 @@ public static class Lossy @@
                 // Issues
                 public const string Issue1594 = "Webp/issues/Issue1594.webp";
+                public const string Issue2243 = "Webp/issues/Issue2243.webp";
             }
         }
@@ Expand Down @@