Fix UTF-8 combining characters in column 0, based on a diff from Keith

Winstein.

diff --git a/usr.bin/tmux/screen-write.c b/usr.bin/tmux/screen-write.c
index c1599c3..8fac027 100644 (file)
--- a/usr.bin/tmux/screen-write.c
+++ b/usr.bin/tmux/screen-write.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: screen-write.c,v 1.118 2017/04/25 18:30:29 nicm Exp $ */
+/* $OpenBSD: screen-write.c,v 1.119 2017/04/29 21:27:46 nicm Exp $ */
 
 /*
  * Copyright (c) 2007 Nicholas Marriott <nicholas.marriott@gmail.com>
@@ -1316,12 +1316,12 @@ screen_write_combine(struct screen_write_ctx *ctx, const struct utf8_data *ud,
                fatalx("UTF-8 data empty");
 
        /* Retrieve the previous cell. */
-       for (n = 1; n < s->cx; n++) {
+       for (n = 1; n <= s->cx; n++) {
                grid_view_get_cell(gd, s->cx - n, s->cy, &gc);
                if (~gc.flags & GRID_FLAG_PADDING)
                        break;
        }
-       if (n == s->cx)
+       if (n > s->cx)
                return (NULL);
        *xx = s->cx - n;