wez/wezterm
1
1
Fork 0
mirror of https://github.com/wez/wezterm.git synced 2024-12-24 13:52:55 +03:00
Code Issues Projects Releases Wiki Activity

centralize image data size sanity checking, add to kitty

Browse Source 
refs: https://github.com/wez/wezterm/issues/1031#issuecomment-1030056063
This commit is contained in:
Wez Furlong 2022-02-04 08:58:23 -07:00
parent 092663a332
commit 3e2f5263bc
4 changed files with 43 additions and 40 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

34
term/src/terminalstate/image.rs
View File

@ -238,3 +238,37 @@ impl TerminalState {
}
}
}
pub(crate) fn check_image_dimensions(width: u32, height: u32) -> anyhow::Result<()> {
const MAX_IMAGE_SIZE: u32 = 100_000_000;
let size = width.saturating_mul(height).saturating_mul(4);
if size > MAX_IMAGE_SIZE {
anyhow::bail!(
"Ignoring image data {}x{} because {} bytes > max allowed {}",
width,
height,
size,
MAX_IMAGE_SIZE
);
}
Ok(())
}
pub(crate) struct ImageInfo {
pub width: u32,
pub height: u32,
pub format: image::ImageFormat,
}
pub(crate) fn dimensions(data: &[u8]) -> anyhow::Result<ImageInfo> {
let reader = image::io::Reader::new(std::io::Cursor::new(data)).with_guessed_format()?;
let format = reader
.format()
.ok_or_else(|| anyhow::anyhow!("unknown format!?"))?;
let (width, height) = reader.into_dimensions()?;
Ok(ImageInfo {
width,
height,
format,
})
}

32
term/src/terminalstate/iterm.rs
View File

@ -21,26 +21,6 @@ impl TerminalState {
return;
}
struct Info {
width: u32,
height: u32,
format: ImageFormat,
}
fn dimensions(data: &[u8]) -> anyhow::Result<Info> {
let reader =
image::io::Reader::new(std::io::Cursor::new(data)).with_guessed_format()?;
let format = reader
.format()
.ok_or_else(|| anyhow::anyhow!("unknown format!?"))?;
let (width, height) = reader.into_dimensions()?;
Ok(Info {
width,
height,
format,
})
}
let info = match dimensions(&image.data) {
Ok(dims) => dims,
Err(e) => {
@ -54,16 +34,8 @@ impl TerminalState {
}
};
const MAX_IMAGE_SIZE: u32 = 100_000_000;
let size = info.width.saturating_mul(info.height).saturating_mul(4);
if size > MAX_IMAGE_SIZE {
log::error!(
"Ignoring iterm image data {}x{} because {} bytes > max allowed {}",
info.width,
info.height,
size,
MAX_IMAGE_SIZE
);
if let Err(err) = check_image_dimensions(info.width, info.height) {
log::error!("{}", err);
return;
}

4
term/src/terminalstate/kitty.rs
View File

@ -784,6 +784,8 @@ impl TerminalState {
}
};
check_image_dimensions(width, height)?;
let data = match transmit.format {
Some(KittyImageFormat::Rgb) => {
let img = DynamicImage::ImageRgb8(
@ -808,6 +810,8 @@ impl TerminalState {
ImageDataType::new_single_frame(width, height, data)
}
Some(KittyImageFormat::Png) => {
let info = dimensions(&data)?;
check_image_dimensions(info.width, info.height)?;
let decoded = image::load_from_memory(&data).context("decode png")?;
let (width, height) = decoded.dimensions();
let data = decoded.into_rgba8().into_vec();

13
term/src/terminalstate/sixel.rs
View File

@ -9,16 +9,9 @@ use termwiz::image::ImageDataType;
impl TerminalState {
pub(crate) fn sixel(&mut self, sixel: Box<Sixel>) {
let (width, height) = sixel.dimensions();
const MAX_IMAGE_SIZE: u32 = 100_000_000;
let size = width.saturating_mul(height).saturating_mul(4);
if size > MAX_IMAGE_SIZE {
log::error!(
"Ignoring sixel image data {}x{} because {} bytes > max allowed {}",
width,
height,
size,
MAX_IMAGE_SIZE
);
if let Err(err) = check_image_dimensions(width, height) {
log::error!("{}", err);
return;
}