From 0027aa3d1e56e4c03136d054f812725fe78b07b3 Mon Sep 17 00:00:00 2001
From: Tiago Cunha <tcunha@gmx.com>
Date: Thu, 20 Aug 2009 11:52:39 +0000
Subject: [PATCH] Sync OpenBSD patchset 278:

Don't read beyond the edge of the screen when searching (dies with debug
enabled).
---
 window-copy.c | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/window-copy.c b/window-copy.c
index 6eadbbdd..7039f88c 100644
--- a/window-copy.c
+++ b/window-copy.c
@@ -1,4 +1,4 @@
-/* $Id: window-copy.c,v 1.82 2009-08-20 11:23:36 tcunha Exp $ */
+/* $Id: window-copy.c,v 1.83 2009-08-20 11:52:39 tcunha Exp $ */
 
 /*
  * Copyright (c) 2007 Nicholas Marriott <nicm@users.sourceforge.net>
@@ -504,6 +504,8 @@ window_copy_search_rl(struct grid *gd,
 	u_int	ax, bx, px;
 
 	for (ax = last + 1; ax > first; ax--) {
+		if (gd->sx - (ax - 1) < sgd->sx)
+			continue;
 		for (bx = 0; bx < sgd->sx; bx++) {
 			px = ax - 1 + bx;
 			if (!window_copy_search_compare(gd, px, py, sgd, bx))