Merge branch 'obsd-master'

1 files changed, 5 insertions, 1 deletions

diff --git a/screen-write.c b/screen-write.c
index 923dac6e..6892d041 100644
--- a/screen-write.c
+++ b/screen-write.c
@@ -2110,7 +2110,7 @@ screen_write_combine(struct screen_write_ctx *ctx, const struct grid_cell *gc)
 
 	/*
 	 * Check if we need to combine characters. This could be zero width
-	 * (zet above), a modifier character (with an existing Unicode
+	 * (set above), a modifier character (with an existing Unicode
 	 * character) or a previous ZWJ.
 	 */
 	if (!zero_width) {
@@ -2122,6 +2122,10 @@ screen_write_combine(struct screen_write_ctx *ctx, const struct grid_cell *gc)
 			return (0);
 	}
 
+	/* Check if this combined character would be too long. */
+	if (last.data.size + ud->size > sizeof last.data.data)
+		return (0);
+
 	/* Combining; flush any pending output. */
 	screen_write_collect_flush(ctx, 0, __func__);