Merge pull request #1757 from fintelia/bug-1750

Fix arithmetic overflow in TIFF error reporting
image-rs · Jul 10, 2022 · 90e8c11 · 90e8c11
2 parents 04052e6 + 3f81a8d
commit 90e8c11
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 3 deletions.
diff --git a/.github/workflows/rust.yml b/.github/workflows/rust.yml
@@ -22,6 +22,7 @@ jobs:
       env:
         FEATURES: ${{ matrix.features }}
     - name: test
+      if: ${{ matrix.rust == 'stable' || matrix.rust == 'beta' || matrix.rust == 'nightly' }}
       run: >
         cargo test -v --no-default-features --features "$FEATURES" &&
         cargo doc -v --no-default-features --features "$FEATURES"

diff --git a/src/codecs/tiff.rs b/src/codecs/tiff.rs
@@ -66,10 +66,10 @@ where
             tiff::ColorType::Palette(n) | tiff::ColorType::Gray(n) => {
                 return Err(err_unknown_color_type(n))
             }
-            tiff::ColorType::GrayA(n) => return Err(err_unknown_color_type(n * 2)),
-            tiff::ColorType::RGB(n) => return Err(err_unknown_color_type(n * 3)),
+            tiff::ColorType::GrayA(n) => return Err(err_unknown_color_type(n.saturating_mul(2))),
+            tiff::ColorType::RGB(n) => return Err(err_unknown_color_type(n.saturating_mul(3))),
             tiff::ColorType::RGBA(n) | tiff::ColorType::CMYK(n) => {
-                return Err(err_unknown_color_type(n * 4))
+                return Err(err_unknown_color_type(n.saturating_mul(4)))
             }
         };