diff options
| author | nicm <nicm> | 2019-12-12 15:03:13 +0000 |
|---|---|---|
| committer | nicm <nicm> | 2019-12-12 15:03:13 +0000 |
| commit | dcf41ec9275a2a1a87a5943d9ba189d83de67a89 (patch) | |
| tree | d0820de6900abfc52dcecedf4cd499077ad0b4f5 /mode-tree.c | |
| parent | 2b2b19379110fd90f4d84fb973628900f2d3fd4d (diff) | |
| download | rtmux-dcf41ec9275a2a1a87a5943d9ba189d83de67a89.tar.gz rtmux-dcf41ec9275a2a1a87a5943d9ba189d83de67a89.tar.bz2 rtmux-dcf41ec9275a2a1a87a5943d9ba189d83de67a89.zip | |
Do not crash in tree modes if the pane is only 1 in width, reported by
KOIE Hidetaka in GitHub issue 2015.
Diffstat (limited to 'mode-tree.c')
| -rw-r--r-- | mode-tree.c | 6 |
1 files changed, 4 insertions, 2 deletions
diff --git a/mode-tree.c b/mode-tree.c index 054989fb..b9fa5f65 100644 --- a/mode-tree.c +++ b/mode-tree.c @@ -598,6 +598,8 @@ mode_tree_draw(struct mode_tree_data *mtd) xasprintf(&text, "%-*s%s%s%s: ", keylen, key, start, mti->name, tag); width = utf8_cstrwidth(text); + if (width > w) + width = w; free(start); if (mti->tagged) { @@ -607,11 +609,11 @@ mode_tree_draw(struct mode_tree_data *mtd) if (i != mtd->current) { screen_write_clearendofline(&ctx, 8); - screen_write_puts(&ctx, &gc0, "%s", text); + screen_write_nputs(&ctx, w, &gc0, "%s", text); format_draw(&ctx, &gc0, w - width, mti->text, NULL); } else { screen_write_clearendofline(&ctx, gc.bg); - screen_write_puts(&ctx, &gc, "%s", text); + screen_write_nputs(&ctx, w, &gc, "%s", text); format_draw(&ctx, &gc, w - width, mti->text, NULL); } free(text); |