Skip to content

Fix panic caused by unsupported TIFF format #287

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
mhils merged 1 commit into from
Nov 19, 2025
Merged

Fix panic caused by unsupported TIFF format #287

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
27 changes: 15 additions & 12 deletions src/processes/macos_icons.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -31,25 +31,28 @@ impl IconCache {
tiff.hash(&mut hasher);
let tiff_hash = hasher.finish();
e.insert(tiff_hash);
let icon = self
.icons
.entry(tiff_hash)
.or_insert_with(|| tiff_to_png(&tiff));
let icon = match self.icons.entry(tiff_hash) {
Entry::Occupied(e) => e.into_mut(),
Entry::Vacant(e) => {
let png = tiff_to_png(&tiff)?;
e.insert(png)
}
};
Ok(icon)
}
}
}
}

pub fn tiff_to_png(tiff: &[u8]) -> Vec<u8> {
pub fn tiff_to_png(tiff: &[u8]) -> Result<Vec<u8>> {
let mut c = Cursor::new(Vec::new());
let tiff_image = image::load_from_memory_with_format(tiff, image::ImageFormat::Tiff)
.unwrap()
.resize(32, 32, image::imageops::FilterType::Triangle);
tiff_image
.write_to(&mut c, image::ImageFormat::Png)
.unwrap();
c.into_inner()
let tiff_image = image::load_from_memory_with_format(tiff, image::ImageFormat::Tiff)?.resize(
32,
32,
image::imageops::FilterType::Triangle,
);
tiff_image.write_to(&mut c, image::ImageFormat::Png)?;
Ok(c.into_inner())
}

pub fn tiff_data_for_executable(executable: &Path) -> Result<Vec<u8>> {
Expand Down
Loading