diff --git a/CHANGELOG.md b/CHANGELOG.md index cd5e189e..dad72e81 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -20,6 +20,7 @@ Notable changes to the `alacritty_terminal` crate are documented in its - Spurious "Failed to set new owner of XCB selection" warnings on X11 - Lacking permissions to launch software sending Apple events - Off-by-one in vi mode ParagraphUp action +- Unbounded per-cell memory usage for zero-width cells ## 0.17.0 diff --git a/Cargo.lock b/Cargo.lock index 166d049b..a64ef1c8 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -97,6 +97,7 @@ dependencies = [ name = "alacritty_terminal" version = "0.26.1-dev" dependencies = [ + "arrayvec", "base64", "bitflags 2.9.4", "home", @@ -205,6 +206,9 @@ name = "arrayvec" version = "0.7.6" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "7c02d123df017efcdfbd739ef81735b36c5ba83ec3c59c80a9d7ecc718f92e50" +dependencies = [ + "serde", +] [[package]] name = "as-raw-xcb-connection" diff --git a/alacritty_terminal/CHANGELOG.md b/alacritty_terminal/CHANGELOG.md index 248f9a53..b2a532ec 100644 --- a/alacritty_terminal/CHANGELOG.md +++ b/alacritty_terminal/CHANGELOG.md @@ -14,6 +14,7 @@ The format is based on [Keep a Changelog](https://keepachangelog.com/en/1.0.0/). - Panic when the PTY could not be set to non-blocking - Off-by-one in ViMotion::ParagraphUp +- Unbounded per-cell memory usage for zero-width cells ## 0.26.0 diff --git a/alacritty_terminal/Cargo.toml b/alacritty_terminal/Cargo.toml index bd58353e..f099d8cb 100644 --- a/alacritty_terminal/Cargo.toml +++ b/alacritty_terminal/Cargo.toml @@ -15,6 +15,7 @@ default = ["serde"] serde = ["dep:serde", "bitflags/serde", "vte/serde"] [dependencies] +arrayvec = { version = "0.7.2", features = ["serde"] } base64 = "0.22.0" bitflags = "2.4.1" home = "0.5.5" diff --git a/alacritty_terminal/src/term/cell.rs b/alacritty_terminal/src/term/cell.rs index 484eabe8..02737685 100644 --- a/alacritty_terminal/src/term/cell.rs +++ b/alacritty_terminal/src/term/cell.rs @@ -1,6 +1,7 @@ use std::sync::Arc; use std::sync::atomic::{AtomicU32, Ordering}; +use arrayvec::ArrayVec; use bitflags::bitflags; #[cfg(feature = "serde")] use serde::{Deserialize, Serialize}; @@ -9,6 +10,12 @@ use crate::grid::{self, GridCell}; use crate::index::Column; use crate::vte::ansi::{Color, Hyperlink as VteHyperlink, NamedColor}; +/// Maximum number of zerowidth characters to retain per grid cell. +/// +/// This enforces an upper bound on memory usage per cell, to ensure +/// malicous applications cannot use this as a DoS vector. +const MAX_ZEROWIDTH_CHARS: usize = 9; + bitflags! { #[derive(Debug, Clone, Copy, PartialEq, Eq, Hash)] #[cfg_attr(feature = "serde", derive(Serialize, Deserialize))] @@ -123,7 +130,7 @@ impl ResetDiscriminant for Cell { #[derive(Default, Debug, Clone, Eq, PartialEq)] #[cfg_attr(feature = "serde", derive(Serialize, Deserialize))] pub struct CellExtra { - zerowidth: Vec, + zerowidth: ArrayVec, underline_color: Option, hyperlink: Option, } @@ -163,7 +170,7 @@ impl Cell { #[inline] pub fn push_zerowidth(&mut self, character: char) { let extra = self.extra.get_or_insert(Default::default()); - Arc::make_mut(extra).zerowidth.push(character); + let _ = Arc::make_mut(extra).zerowidth.try_push(character); } /// Remove all wide char data from a cell. @@ -171,7 +178,7 @@ impl Cell { pub fn clear_wide(&mut self) { self.flags.remove(Flags::WIDE_CHAR); if let Some(extra) = self.extra.as_mut() { - Arc::make_mut(extra).zerowidth = Vec::new(); + Arc::make_mut(extra).zerowidth = ArrayVec::new(); } self.c = ' '; }