From 9bd14c0fd217721d32f52808878ed7e89bb82a16 Mon Sep 17 00:00:00 2001 From: Daniel Eklöf Date: Sat, 8 May 2021 19:02:33 +0200 Subject: sixel: fix assertion: image is allowed to cover the entire scrollback --- sixel.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'sixel.c') diff --git a/sixel.c b/sixel.c index 0e8c58d5..910e4a5f 100644 --- a/sixel.c +++ b/sixel.c @@ -799,7 +799,7 @@ sixel_unhook(struct terminal *term) .opaque = !term->sixel.transparent_bg, }; - xassert(image.rows < term->grid->num_rows); + xassert(image.rows <= term->grid->num_rows); xassert(image.pos.row + image.rows - 1 < term->grid->num_rows); LOG_DBG("generating %dx%d pixman image at %d-%d", -- cgit v1.3 From ba451af5c73ae4198b354690f2f2321364367d36 Mon Sep 17 00:00:00 2001 From: Daniel Eklöf Date: Sat, 8 May 2021 19:03:08 +0200 Subject: sixel: don’t emit sixels that will end up covering more than the entire scrollback MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit This limit can be reached by the sixel alone, or the sixel + the final newline. Closes #494 --- sixel.c | 18 ++++++++++++++++-- 1 file changed, 16 insertions(+), 2 deletions(-) (limited to 'sixel.c') diff --git a/sixel.c b/sixel.c index 910e4a5f..5840e887 100644 --- a/sixel.c +++ b/sixel.c @@ -761,14 +761,28 @@ sixel_unhook(struct terminal *term) int start_row = do_scroll ? term->grid->cursor.point.row : 0; const int start_col = do_scroll ? term->grid->cursor.point.col : 0; - if (pixel_rows_left == 0 || rows_avail == 0) { + /* Total number of rows needed by image (+ optional newline at the end) */ + const int rows_needed = + (term->sixel.image.height + term->cell_height - 1) / term->cell_height + + (term->sixel.cursor_right_of_graphics ? 0 : 1); + + /* Will we be emitting anything at all? */ + const bool no_emission = + rows_needed > term->grid->num_rows || + pixel_rows_left == 0 || + rows_avail == 0; + + if (no_emission) { /* We won’t be emitting any sixels - free backing image */ free(term->sixel.image.data); } /* We do not allow sixels to cross the scrollback wrap-around, as * this makes intersection calculations much more complicated */ - while (pixel_rows_left > 0 && rows_avail > 0) { + while (pixel_rows_left > 0 && + rows_avail > 0 && + rows_needed <= term->grid->num_rows) + { const int cur_row = (term->grid->offset + start_row) & (term->grid->num_rows - 1); const int rows_left_until_wrap_around = term->grid->num_rows - cur_row; const int usable_rows = min(rows_avail, rows_left_until_wrap_around); -- cgit v1.3