Merge pull request #1971 from fintelia/webp-encode-zero

Fix panic attempting to encode zero sized webp
image-rs · Aug 4, 2023 · 31ecbe6 · 31ecbe6
2 parents 814596e + cb92511
commit 31ecbe6
Showing 1 changed file with 5 additions and 1 deletion.
diff --git a/src/codecs/webp/encoder.rs b/src/codecs/webp/encoder.rs
@@ -94,7 +94,11 @@ impl<W: Write> WebPEncoder<W> {
         };
 
         // Validate dimensions upfront to avoid panics.
-        if !SampleLayout::row_major_packed(color.channel_count(), width, height).fits(data.len()) {
+        if width == 0
+            || height == 0
+            || !SampleLayout::row_major_packed(color.channel_count(), width, height)
+                .fits(data.len())
+        {
             return Err(ImageError::Parameter(ParameterError::from_kind(
                 ParameterErrorKind::DimensionMismatch,
             )));