summaryrefslogtreecommitdiffstats
path: root/input.c
diff options
context:
space:
mode:
authornicm <nicm>2017-06-04 09:02:36 +0000
committernicm <nicm>2017-06-04 09:02:36 +0000
commit8149bc3fa6e93cb083b165a21baa5ec07dd473dc (patch)
tree1192f61bf7b49276ef6dc1a6c62c6d5d20566036 /input.c
parentadf5628087829bed2eff635760d7cc456dd1e558 (diff)
Be more strict about escape sequences that rename windows or set titles:
ignore any that not valid UTF-8 outright, and for good measure pass the result through our UTF-8-aware vis(3).
Diffstat (limited to 'input.c')
-rw-r--r--input.c13
1 files changed, 9 insertions, 4 deletions
diff --git a/input.c b/input.c
index 5ba2ec5f..27c0a31a 100644
--- a/input.c
+++ b/input.c
@@ -1896,8 +1896,10 @@ input_exit_osc(struct input_ctx *ictx)
switch (option) {
case 0:
case 2:
- screen_set_title(ictx->ctx.s, p);
- server_status_window(ictx->wp->window);
+ if (utf8_isvalid(p)) {
+ screen_set_title(ictx->ctx.s, p);
+ server_status_window(ictx->wp->window);
+ }
break;
case 4:
input_osc_4(ictx->wp, p);
@@ -1909,7 +1911,7 @@ input_exit_osc(struct input_ctx *ictx)
input_osc_11(ictx->wp, p);
break;
case 12:
- if (*p != '?') /* ? is colour request */
+ if (utf8_isvalid(p) && *p != '?') /* ? is colour request */
screen_set_cursor_colour(ictx->ctx.s, p);
break;
case 52:
@@ -1945,6 +1947,8 @@ input_exit_apc(struct input_ctx *ictx)
return;
log_debug("%s: \"%s\"", __func__, ictx->input_buf);
+ if (!utf8_isvalid(ictx->input_buf))
+ return;
screen_set_title(ictx->ctx.s, ictx->input_buf);
server_status_window(ictx->wp->window);
}
@@ -1968,9 +1972,10 @@ input_exit_rename(struct input_ctx *ictx)
return;
log_debug("%s: \"%s\"", __func__, ictx->input_buf);
+ if (!utf8_isvalid(ictx->input_buf))
+ return;
window_set_name(ictx->wp->window, ictx->input_buf);
options_set_number(ictx->wp->window->options, "automatic-rename", 0);
-
server_status_window(ictx->wp->window);
}