aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--CHANGELOG.md3
-rw-r--r--sixel.c26
2 files changed, 26 insertions, 3 deletions
diff --git a/CHANGELOG.md b/CHANGELOG.md
index cad31efd..f4276f0a 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -62,6 +62,9 @@
### Removed
### Fixed
+* Crash when changing aspect ratio of a sixel, in the middle of the
+ sixel data (this is unsupported in foot, but should of course not
+ result in a crash).
* Crash when printing double-width (or longer) characters to, or near,
the last column, when auto-wrap (private mode 7) has been disabled.
* Dynamically sized sixel being trimmed to nothing.
diff --git a/sixel.c b/sixel.c
index 85be3608..d6bfa3a4 100644
--- a/sixel.c
+++ b/sixel.c
@@ -1852,12 +1852,32 @@ decgra(struct terminal *term, uint8_t c)
pan = pan > 0 ? pan : 1;
pad = pad > 0 ? pad : 1;
+ if (likely(term->sixel.image.width == 0 &&
+ term->sixel.image.height == 0))
+ {
+ term->sixel.pan = pan;
+ term->sixel.pad = pad;
+ } else {
+ /*
+ * Unsure what the VT340 does...
+ *
+ * We currently do *not* handle changing pan/pad in the
+ * middle of a sixel, since that means resizing/stretching
+ * the existing image.
+ *
+ * I'm *guessing* the VT340 simply changes the aspect
+ * ratio of all subsequent sixels. But, given the design
+ * of our implementation (the entire sixel is written to a
+ * single pixman image), we can't easily do that.
+ */
+ LOG_WARN("sixel: unsupported: pan/pad changed after printing sixels");
+ pan = term->sixel.pan;
+ pad = term->sixel.pad;
+ }
+
pv *= pan;
ph *= pad;
- term->sixel.pan = pan;
- term->sixel.pad = pad;
-
LOG_DBG("pan=%u, pad=%u (aspect ratio = %d:%d), size=%ux%u",
pan, pad, pan, pad, ph, pv);