aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMicah Cowan <micah@micah.cowan.name>2010-04-28 14:29:27 +0000
committerMicah Cowan <micah@micah.cowan.name>2010-04-28 14:29:27 +0000
commit342a47bc779a9c1391c11e77bde67b7262b736aa (patch)
tree8d46e3b144dc00c62be971e4083394fad03c3e3d
parent18ed37622ea2e19b9efb1f882ec9148dfd26862a (diff)
downloadrtmux-342a47bc779a9c1391c11e77bde67b7262b736aa.tar.gz
rtmux-342a47bc779a9c1391c11e77bde67b7262b736aa.tar.bz2
rtmux-342a47bc779a9c1391c11e77bde67b7262b736aa.zip
Avoid crashing in copy-mode during resize, when our history-viewing offset is larger than the new total number of history lines.
-rw-r--r--window-copy.c4
1 files changed, 3 insertions, 1 deletions
diff --git a/window-copy.c b/window-copy.c
index f563863c..2e7c4778 100644
--- a/window-copy.c
+++ b/window-copy.c
@@ -1,4 +1,4 @@
-/* $Id: window-copy.c,v 1.115 2010-04-06 22:02:52 nicm Exp $ */
+/* $Id: window-copy.c,v 1.116 2010-04-28 14:29:27 micahcowan Exp $ */
/*
* Copyright (c) 2007 Nicholas Marriott <nicm@users.sourceforge.net>
@@ -340,6 +340,8 @@ window_copy_resize(struct window_pane *wp, u_int sx, u_int sy)
data->cy = sy - 1;
if (data->cx > sx)
data->cx = sx;
+ if (data->oy > screen_hsize(data->backing))
+ data->oy = screen_hsize(data->backing);
window_copy_clear_selection(wp);