aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorDaniel Eklöf <daniel@ekloef.se>2020-10-02 18:55:10 +0000
committerDaniel Eklöf <daniel@ekloef.se>2020-10-09 05:44:13 +0000
commit96405c2ca97aed6bb126a5a39d81b97100743b78 (patch)
tree1ff585124e0e82503b0c7649bbea05101b448e95
parentsixel: fold long line (diff)
sixel: overwrite-by-rectangle expects ‘width’ to not exceed screen
This fixes a crash when the emitted sixel extends beyond the right margin. The crash only happens when there are other sixel images already emitted. Fixes part of #151
-rw-r--r--CHANGELOG.md2
-rw-r--r--sixel.c3
2 files changed, 4 insertions, 1 deletions
diff --git a/CHANGELOG.md b/CHANGELOG.md
index f919972d..87e6440f 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -61,6 +61,8 @@
* Crash when `foot.ini` contains an invalid section name
(https://codeberg.org/dnkl/foot/issues/159).
* Background opacity when in _reverse video_ mode.
+* Crash when writing a sixel image that extends outside the terminal's
+ right margin (https://codeberg.org/dnkl/foot/issues/151).
### Security
diff --git a/sixel.c b/sixel.c
index f9c11037..0600a434 100644
--- a/sixel.c
+++ b/sixel.c
@@ -482,7 +482,8 @@ sixel_unhook(struct terminal *term)
};
sixel_overwrite_by_rectangle(
- term, cursor->row, image.pos.col, image.rows, image.cols);
+ term, cursor->row, image.pos.col,
+ image.rows, min(image.cols, term->cols - image.pos.col));
LOG_DBG("generating %dx%d pixman image at %d-%d",
image.width, image.height,