Fix crash

emmabritton · Jan 4, 2024 · d659492 · d659492
1 parent 532d25a
commit d659492
Show file tree

Hide file tree

Showing 5 changed files with 13 additions and 9 deletions.
diff --git a/.github/workflows/main.yml b/.github/workflows/main.yml
@@ -18,6 +18,7 @@ jobs:
           toolchain: stable
           override: true
       - run: cargo fmt --all -- --check
+      - run: cargo test
       - run: cargo clippy --all -- -D warnings
       - run: cargo publish --token ${CRATES_TOKEN}
         env:

diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -1,5 +1,8 @@
 # Changelog
 
+### Version 0.1.5
+- Fix crash with large palette sizes
+
 ### Version 0.1.4
 - Add `width()` and `height()` for `AnimatedIndexedImage`
 

diff --git a/Cargo.toml b/Cargo.toml
@@ -1,6 +1,6 @@
 [package]
 name = "ici-files"
-version = "0.1.4"
+version = "0.1.5"
 edition = "2021"
 authors = ["Emma Britton <emmabritton@pm.me>"]
 description = "Encode/decode ici files"

diff --git a/src/animated.rs b/src/animated.rs
@@ -977,32 +977,32 @@ mod test {
             Once,
         )
         .unwrap();
-        assert!(!image.animate());
+        assert!(!image.animating());
         assert_eq!(image.get_current_frame_pixels(), &[0]);
         image.update(1.0);
         image.update(0.1);
         assert_eq!(image.get_current_frame_pixels(), &[0]);
         image.set_animate(true);
-        assert!(image.animate());
+        assert!(image.animating());
         image.update(1.0);
         image.update(0.1);
-        assert!(image.animate());
+        assert!(image.animating());
         assert_eq!(image.get_current_frame_pixels(), &[1]);
         image.update(1.0);
         image.update(0.1);
-        assert!(image.animate());
+        assert!(image.animating());
         assert_eq!(image.get_current_frame_pixels(), &[2]);
         image.update(1.0);
         image.update(0.1);
-        assert!(image.animate());
+        assert!(image.animating());
         assert_eq!(image.get_current_frame_pixels(), &[3]);
         image.update(1.0);
         image.update(0.1);
-        assert!(!image.animate());
+        assert!(!image.animating());
         assert_eq!(image.get_current_frame_pixels(), &[0]);
         image.update(1.0);
         image.update(0.1);
-        assert!(!image.animate());
+        assert!(!image.animating());
         assert_eq!(image.get_current_frame_pixels(), &[0]);
     }
 }
diff --git a/src/palette.rs b/src/palette.rs
@@ -120,7 +120,7 @@ pub(crate) fn read(
             }
             let count = bytes[start_idx];
             start_idx += 1;
-            let end = (count * 4) as usize;
+            let end = count as usize * 4;
             if bytes.len() < start_idx + end {
                 return Err(InvalidFileFormat(
                     start_idx,