From 289320a9b19e6be855756e54a545615026b099f8 Mon Sep 17 00:00:00 2001 From: Nicholas Marriott Date: Sat, 11 Jul 2009 19:09:24 +0000 Subject: [PATCH] Copy was using the real line length which after resize can be larger than the screen width. When built with -DDEBUG, this made the grid bounds checking code kill the server. Restrict copying to the actual width. From Kalle Olavi Niemitalo, thanks. --- window-copy.c | 8 ++++++++ 1 file changed, 8 insertions(+) diff --git a/window-copy.c b/window-copy.c index 26a54f4c..5aff70ff 100644 --- a/window-copy.c +++ b/window-copy.c @@ -522,7 +522,15 @@ window_copy_find_length(struct window_pane *wp, u_int py) const struct grid_cell *gc; u_int px; + /* + * If the pane has been resized, its grid can contain old overlong + * lines. grid_peek_cell does not allow accessing cells beyond the + * width of the grid, and screen_write_copy treats them as spaces, so + * ignore them here too. + */ px = wp->base.grid->size[py]; + if (px > screen_size_x(&wp->base)) + px = screen_size_x(&wp->base); while (px > 0) { gc = grid_peek_cell(wp->base.grid, px - 1, py); if (gc->flags & GRID_FLAG_UTF8)