diff options
| author | Daniel Eklöf <daniel@ekloef.se> | 2021-06-24 15:30:16 +0000 |
|---|---|---|
| committer | Daniel Eklöf <daniel@ekloef.se> | 2021-06-24 15:30:16 +0000 |
| commit | c1cde66f70bd6f998573d599540349aa3a2edad5 (patch) | |
| tree | 317ab6834bb7bfc2c903fadb2c8fbb04caf02318 | |
| parent | Merge branch 'custom-terminfo-install-location' (diff) | |
| parent | sixel: fix crash when splitting up an image across the scrollback (diff) | |
Merge branch 'sixel-heap-user-after-free-after-blending'
| -rw-r--r-- | sixel.c | 22 |
1 files changed, 10 insertions, 12 deletions
@@ -964,16 +964,7 @@ sixel_unhook(struct terminal *term) (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); - } + bool free_image_data = true; /* We do not allow sixels to cross the scrollback wrap-around, as * this makes intersection calculations much more complicated */ @@ -991,9 +982,13 @@ sixel_unhook(struct terminal *term) const int height = min(pixel_rows_left, pixel_rows_avail); uint32_t *img_data; - if (pixel_row_idx == 0) + if (pixel_row_idx == 0 && height == pixel_rows_left) { + /* Entire image will be emitted as a single chunk - reuse + * the source buffer */ img_data = term->sixel.image.data; - else { + free_image_data = false; + } else { + xassert(free_image_data); img_data = xmalloc(height * stride); memcpy( img_data, @@ -1080,6 +1075,9 @@ sixel_unhook(struct terminal *term) start_row -= image.rows; } + if (free_image_data) + free(term->sixel.image.data); + term->sixel.image.data = NULL; term->sixel.image.width = 0; term->sixel.image.height = 0; |
