caisin/typst
1
0
Fork 0
mirror of https://github.com/typst/typst synced 2025-07-27 14:27:56 +08:00
Code Issues Packages Projects Releases Wiki Activity

fix: out of bounds access when tagging table cells

Browse Source
This commit is contained in:
Tobias Schmitz 2025-07-14 12:40:18 +02:00
parent 9bbfe4c14a
commit e43b8bbb7f
No known key found for this signature in database
1 changed files with 8 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
crates/typst-pdf/src/tags/table.rs
View File

@ -16,11 +16,12 @@ pub(crate) struct TableCtx {
pub(crate) id: TableId, pub(crate) id: TableId,
pub(crate) summary: Option<String>, pub(crate) summary: Option<String>,
rows: Vec<Vec<GridCell>>, rows: Vec<Vec<GridCell>>,
min_width: usize,
} }
impl TableCtx { impl TableCtx {
pub(crate) fn new(id: TableId, summary: Option<String>) -> Self { pub(crate) fn new(id: TableId, summary: Option<String>) -> Self {
Self { id, summary, rows: Vec::new() } Self { id, summary, rows: Vec::new(), min_width: 0 }
} }
fn get(&self, x: usize, y: usize) -> Option<&TableCtxCell> { fn get(&self, x: usize, y: usize) -> Option<&TableCtxCell> {
@ -64,14 +65,15 @@ impl TableCtx {
// Extend the table grid to fit this cell. // Extend the table grid to fit this cell.
let required_height = y + rowspan.get(); let required_height = y + rowspan.get();
let required_width = x + colspan.get(); self.min_width = self.min_width.max(x + colspan.get());
if self.rows.len() < required_height { if self.rows.len() < required_height {
self.rows self.rows
.resize(required_height, vec![GridCell::Missing; required_width]); .resize(required_height, vec![GridCell::Missing; self.min_width]);
} }
let row = &mut self.rows[y]; for row in self.rows.iter_mut() {
if row.len() < required_width { if row.len() < self.min_width {
row.resize_with(required_width, || GridCell::Missing); row.resize_with(self.min_width, || GridCell::Missing);
}
} }
// Store references to the cell for all spanned cells. // Store references to the cell for all spanned cells.